- introduce a USE_FUSE macro

- convert all fuse ports to use the new macro The macro makes sure sysutils/fusefs-libs gets installed and depending on fuse being in base or not it installs sysutils/fusefs-kmod. Approved by: portmgr (bapt)
author: Florian Smeets <flo@FreeBSD.org> 2012-12-14 15:47:00 +0000
committer: Florian Smeets <flo@FreeBSD.org> 2012-12-14 15:47:00 +0000
commit: d26530b7136cdbbc743cb41cba488928a2fb490e (patch)
tree: 2f5c5fe4cb36fc6a28856c97750108bf78f9b5b4 /sysutils
parent: 7045030009ee59cfe75c17ba591c3798c3478b68 (diff)
36 files changed, 51 insertions, 112 deletions
diff --git a/sysutils/afflib/Makefile b/sysutils/afflib/Makefile
index fab78d5503e3..2f7796c878b5 100644
--- a/sysutils/afflib/Makefile
+++ b/sysutils/afflib/Makefile
@@ -17,13 +17,13 @@ COMMENT=	The Advanced Forensics Format library and utilities
 
 LICENSE=	BSD
 
-LIB_DEPENDS=	fuse:${PORTSDIR}/sysutils/fusefs-libs \
- 		expat:${PORTSDIR}/textproc/expat2 \
+LIB_DEPENDS=	expat:${PORTSDIR}/textproc/expat2 \
 		curl:${PORTSDIR}/ftp/curl
 
 USE_LDCONFIG=	yes
 USE_OPENSSL=	yes
-USE_ICONV =	yes
+USE_ICONV=	yes
+USE_FUSE=	yes
 USE_GMAKE=	yes
 GNU_CONFIGURE=	yes
 USE_GNOME=	gnomehack
diff --git a/sysutils/archivemount/Makefile b/sysutils/archivemount/Makefile
index 5e913ffd3b6a..b11471537929 100644
--- a/sysutils/archivemount/Makefile
+++ b/sysutils/archivemount/Makefile
@@ -13,15 +13,13 @@ MASTER_SITES=	http://www.cybernoia.de/software/archivemount/
 MAINTAINER=	jirnov@gmail.com
 COMMENT=	Mount archives with FUSE
 
-BUILD_DEPENDS=	${LOCALBASE}/include/fuse.h:${PORTSDIR}/sysutils/fusefs-libs
-RUN_DEPENDS=	${LOCALBASE}/modules/fuse.ko:${PORTSDIR}/sysutils/fusefs-kmod
-
 PLIST_FILES=	bin/archivemount
 MAN1=		archivemount.1
 
 GNU_CONFIGURE=	yes
 
 NO_INSTALL_MANPAGES=	yes
+USE_FUSE=	yes
 USE_GMAKE=	yes
 USE_ICONV=	yes
 USE_PKGCONFIG=	yes
diff --git a/sysutils/avfs/Makefile b/sysutils/avfs/Makefile
index 9f6719c2339b..7cd340dbc132 100644
--- a/sysutils/avfs/Makefile
+++ b/sysutils/avfs/Makefile
@@ -13,9 +13,7 @@ MASTER_SITES=	SF/avf/${PORTNAME}/${PORTVERSION}
 MAINTAINER=	jirnov@gmail.com
 COMMENT=	A Virtual File System
 
-BUILD_DEPENDS=	${LOCALBASE}/include/fuse.h:${PORTSDIR}/sysutils/fusefs-libs \
-		${LOCALBASE}/bin/bash:${PORTSDIR}/shells/bash
-RUN_DEPENDS=	${LOCALBASE}/modules/fuse.ko:${PORTSDIR}/sysutils/fusefs-kmod
+BUILD_DEPENDS=	${LOCALBASE}/bin/bash:${PORTSDIR}/shells/bash
 
 BROKEN=		does not package
 
@@ -24,6 +22,7 @@ NO_INSTALL_MANPAGES=	yes
 CPPFLAGS+=	-I${LOCALBASE}/include -L${LOCALBASE}/lib -liconv
 
 GNU_CONFIGURE=	yes
+USE_FUSE=	yes
 USE_GMAKE=	yes
 USE_BZIP2=	yes
 USE_LDCONFIG=	yes
diff --git a/sysutils/djmount/Makefile b/sysutils/djmount/Makefile
index 53f9675a3e0f..5ec1bd30bead 100644
--- a/sysutils/djmount/Makefile
+++ b/sysutils/djmount/Makefile
@@ -10,13 +10,12 @@ MASTER_SITES=	SF
 MAINTAINER=	eric@camachat.org
 COMMENT=	Mount UPnP A/V Media
 
-LIB_DEPENDS=	fuse.2:${PORTSDIR}/sysutils/fusefs-libs \
-		upnp.9:${PORTSDIR}/devel/upnp
+LIB_DEPENDS=	upnp.9:${PORTSDIR}/devel/upnp
 BUILD_DEPENDS=	iconv:${PORTSDIR}/converters/libiconv
-RUN_DEPENDS=	${LOCALBASE}/modules/fuse.ko:${PORTSDIR}/sysutils/fusefs-kmod
 
 PLIST_FILES=	bin/${PORTNAME}
 GNU_CONFIGURE=	yes
+USE_FUSE=	yes
 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 bd62a390ee66..1cba7a4fb10a 100644
--- a/sysutils/fusefs-afuse/Makefile
+++ b/sysutils/fusefs-afuse/Makefile
@@ -13,9 +13,6 @@ PKGNAMEPREFIX=	fusefs-
 MAINTAINER=	avl@FreeBSD.org
 COMMENT=	An automounting file system implemented in user-space using FUSE
 
-RUN_DEPENDS=	${LOCALBASE}/modules/fuse.ko:${PORTSDIR}/sysutils/fusefs-kmod
-LIB_DEPENDS=	fuse.2:${PORTSDIR}/sysutils/fusefs-libs
-
 MAKE_JOBS_SAFE=	yes
 
 GNU_CONFIGURE=	yes
@@ -23,6 +20,7 @@ GNU_CONFIGURE=	yes
 PORTDOCS=	AUTHORS ChangeLog README
 PLIST_FILES=	bin/${PORTNAME}
 
+USE_FUSE=	yes
 USE_PKGCONFIG=	yes
 
 MAN1=		afuse.1
diff --git a/sysutils/fusefs-chironfs/Makefile b/sysutils/fusefs-chironfs/Makefile
index e81a51ccae0b..d1deb7660a07 100644
--- a/sysutils/fusefs-chironfs/Makefile
+++ b/sysutils/fusefs-chironfs/Makefile
@@ -15,12 +15,10 @@ PKGNAMEPREFIX=	fusefs-
 MAINTAINER=	leeym@FreeBSD.org
 COMMENT=	A FUSE based filesystem with replication at the filesystem level
 
-RUN_DEPENDS=	${LOCALBASE}/modules/fuse.ko:${PORTSDIR}/sysutils/fusefs-kmod
-BUILD_DEPENDS=	${LOCALBASE}/include/fuse.h:${PORTSDIR}/sysutils/fusefs-libs
-
 GNU_CONFIGURE=	yes
 CPPFLAGS+=	-I${LOCALBASE}/include
 LDFLAGS+=	-L${LOCALBASE}/lib
+USE_FUSE=	yes
 
 PLIST_FILES=	bin/chironfs bin/chirctl
 PORTDOCS=	*
diff --git a/sysutils/fusefs-cryptofs/Makefile b/sysutils/fusefs-cryptofs/Makefile
index cd5f07bf48f5..2c7a6ccdec31 100644
--- a/sysutils/fusefs-cryptofs/Makefile
+++ b/sysutils/fusefs-cryptofs/Makefile
@@ -15,13 +15,12 @@ PKGNAMEPREFIX=	fusefs-
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	A encrypted filesystem for FUSE
 
-BUILD_DEPENDS=	${LOCALBASE}/include/fuse.h:${PORTSDIR}/sysutils/fusefs-libs
 LIB_DEPENDS=	gcrypt.18:${PORTSDIR}/security/libgcrypt \
 		glib-2.0:${PORTSDIR}/devel/glib20
-RUN_DEPENDS=	${LOCALBASE}/modules/fuse.ko:${PORTSDIR}/sysutils/fusefs-kmod
 
 USE_BZIP2=	yes
 GNU_CONFIGURE=	yes
+USE_FUSE=	yes
 
 PLIST_FILES=	bin/cryptofs
 
diff --git a/sysutils/fusefs-curlftpfs/Makefile b/sysutils/fusefs-curlftpfs/Makefile
index 956844bf27a1..29f4f2279cd3 100644
--- a/sysutils/fusefs-curlftpfs/Makefile
+++ b/sysutils/fusefs-curlftpfs/Makefile
@@ -15,11 +15,10 @@ PKGNAMEPREFIX=	fusefs-
 MAINTAINER=	dhn@FreeBSD.org
 COMMENT=	Mount remote ftp directories
 
-LIB_DEPENDS=	fuse.2:${PORTSDIR}/sysutils/fusefs-libs \
-		curl.6:${PORTSDIR}/ftp/curl
-RUN_DEPENDS=	${LOCALBASE}/modules/fuse.ko:${PORTSDIR}/sysutils/fusefs-kmod
+LIB_DEPENDS=	curl.6:${PORTSDIR}/ftp/curl
 
 GNU_CONFIGURE=	yes
+USE_FUSE=	yes
 USE_GNOME=	glib20
 MAN1=		${PORTNAME}.1
 PLIST_FILES=	bin/curlftpfs
diff --git a/sysutils/fusefs-encfs/Makefile b/sysutils/fusefs-encfs/Makefile
index 0cd0c947397f..e289896c3889 100644
--- a/sysutils/fusefs-encfs/Makefile
+++ b/sysutils/fusefs-encfs/Makefile
@@ -18,8 +18,6 @@ COMMENT=	An encrypted pass-through FUSE filesystem
 
 LIB_DEPENDS=	rlog.5:${PORTSDIR}/devel/rlog \
 		boost_serialization.4:${PORTSDIR}/devel/boost-libs
-RUN_DEPENDS=	${LOCALBASE}/modules/fuse.ko:${PORTSDIR}/sysutils/fusefs-kmod
-BUILD_DEPENDS=	${LOCALBASE}/include/fuse.h:${PORTSDIR}/sysutils/fusefs-libs
 
 WRKSRC=		${WRKDIR}/encfs-${PORTVERSION}
 
@@ -29,6 +27,7 @@ CONFIGURE_ARGS=	--with-boost-serialization=boost_serialization \
 		--with-boost-filesystem=boost_filesystem
 CPPFLAGS+=	-I${LOCALBASE}/include
 LDFLAGS+=	-L${LOCALBASE}/lib
+USE_FUSE=	yes
 USE_GMAKE=	yes
 USE_LDCONFIG=	yes
 
diff --git a/sysutils/fusefs-exfat/Makefile b/sysutils/fusefs-exfat/Makefile
index d7c648d87e5a..74ea3a237963 100644
--- a/sysutils/fusefs-exfat/Makefile
+++ b/sysutils/fusefs-exfat/Makefile
@@ -13,10 +13,9 @@ COMMENT=	A full-featured exFAT FS implementation as a FUSE module
 
 LICENSE=	GPLv3
 
-LIB_DEPENDS=	fuse:${PORTSDIR}/sysutils/fusefs-libs \
-		ublio:${PORTSDIR}/devel/libublio
-RUN_DEPENDS=	${LOCALBASE}/modules/fuse.ko:${PORTSDIR}/sysutils/fusefs-kmod
+LIB_DEPENDS=	ublio:${PORTSDIR}/devel/libublio
 
+USE_FUSE=	yes
 USE_ICONV=	yes
 USE_SCONS=	yes
 
diff --git a/sysutils/fusefs-ext4fuse/Makefile b/sysutils/fusefs-ext4fuse/Makefile
index 06c649d1a168..6a44f420b817 100644
--- a/sysutils/fusefs-ext4fuse/Makefile
+++ b/sysutils/fusefs-ext4fuse/Makefile
@@ -16,11 +16,9 @@ COMMENT=	EXT4 implementation for FUSE
 
 LICENSE=	GPLv2
 
-BUILD_DEPENDS=	fusefs-libs>=2.7.2:${PORTSDIR}/sysutils/fusefs-libs
-LIB_DEPENDS=	fuse.2:${PORTSDIR}/sysutils/fusefs-libs \
-		execinfo.1:${PORTSDIR}/devel/libexecinfo
-RUN_DEPENDS=	${LOCALBASE}/modules/fuse.ko:${PORTSDIR}/sysutils/fusefs-kmod
+LIB_DEPENDS=	execinfo.1:${PORTSDIR}/devel/libexecinfo
 
+USE_FUSE=	yes
 USE_GMAKE=	yes
 USE_PKGCONFIG=	build
 
diff --git a/sysutils/fusefs-funionfs/Makefile b/sysutils/fusefs-funionfs/Makefile
index 66bfe2d15719..56d00947918e 100644
--- a/sysutils/fusefs-funionfs/Makefile
+++ b/sysutils/fusefs-funionfs/Makefile
@@ -14,12 +14,10 @@ PKGNAMEPREFIX=	fusefs-
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Union filesystem for the FUSE driver
 
-BUILD_DEPENDS=	${LOCALBASE}/include/fuse.h:${PORTSDIR}/sysutils/fusefs-libs
-RUN_DEPENDS=	${LOCALBASE}/modules/fuse.ko:${PORTSDIR}/sysutils/fusefs-kmod
-
 LDFLAGS+=	-L${LOCALBASE}/lib ${PTHREAD_LIBS}
 CFLAGS+=	${PTHREAD_CFLAGS} -I${LOCALBASE}/include
 GNU_CONFIGURE=	yes
+USE_FUSE=	yes
 
 MAN1=		funionfs.1
 PLIST_FILES=	bin/funionfs
diff --git a/sysutils/fusefs-fur/Makefile b/sysutils/fusefs-fur/Makefile
index 180fb3c8e7e7..aa3a1e4091f1 100644
--- a/sysutils/fusefs-fur/Makefile
+++ b/sysutils/fusefs-fur/Makefile
@@ -15,15 +15,14 @@ DISTNAME=	FUR-${PORTVERSION}
 MAINTAINER=	avl@FreeBSD.org
 COMMENT=	FUSE-based filesystem for Windows CE based devices
 
-LIB_DEPENDS=	rapi.2:${PORTSDIR}/palm/synce-librapi2 \
-		fuse.2:${PORTSDIR}/sysutils/fusefs-libs
-RUN_DEPENDS=	${LOCALBASE}/modules/fuse.ko:${PORTSDIR}/sysutils/fusefs-kmod
+LIB_DEPENDS=	rapi.2:${PORTSDIR}/palm/synce-librapi2
 
 OPTIONS=	VCHMOD	"Enable a fake hook for chmod that just returns 0"	on
 
 MAKE_JOBS_SAFE=	yes
 
 GNU_CONFIGURE=	yes
+USE_FUSE=	yes
 USE_GMAKE=	yes
 USE_ICONV=	yes
 USE_GNOME=	pkgconfig
diff --git a/sysutils/fusefs-fusexmp_fh/Makefile b/sysutils/fusefs-fusexmp_fh/Makefile
index 110ad22a762f..ad34340cd95b 100644
--- a/sysutils/fusefs-fusexmp_fh/Makefile
+++ b/sysutils/fusefs-fusexmp_fh/Makefile
@@ -15,10 +15,9 @@ DISTNAME=	fuse-${PORTVERSION}
 MAINTAINER=	buganini@gmail.com
 COMMENT=	Dummy driver from fusefs-libs example
 
-LIB_DEPENDS=	fuse.2:${PORTSDIR}/sysutils/fusefs-libs
-RUN_DEPENDS=	${LOCALBASE}/modules/fuse.ko:${PORTSDIR}/sysutils/fusefs-kmod
 
 USE_AUTOTOOLS=	libtool
+USE_FUSE=	yes
 USE_GNOME=	pkgconfig
 USE_LDCONFIG=	yes
 USE_ICONV=	yes
diff --git a/sysutils/fusefs-gnome-vfs/Makefile b/sysutils/fusefs-gnome-vfs/Makefile
index 9b9f525c5082..28857a595413 100644
--- a/sysutils/fusefs-gnome-vfs/Makefile
+++ b/sysutils/fusefs-gnome-vfs/Makefile
@@ -15,11 +15,9 @@ DISTNAME=	${RPORTNAME}-${PORTVERSION}
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Interface between FUSE and the Gnome VFS 2.0
 
-RUN_DEPENDS=	${LOCALBASE}/modules/fuse.ko:${PORTSDIR}/sysutils/fusefs-kmod
-BUILD_DEPENDS=	${LOCALBASE}/include/fuse.h:${PORTSDIR}/sysutils/fusefs-libs
-
 RPORTNAME=	gnome-vfs-fuse
 WRKSRC=		${WRKDIR}/${RPORTNAME}
+USE_FUSE=	yes
 USE_GNOME=	gnomevfs2
 USE_GMAKE=	yes
 USE_PKGCONFIG=	yes
diff --git a/sysutils/fusefs-gstfs/Makefile b/sysutils/fusefs-gstfs/Makefile
index 5704465189b9..7e821f70de97 100644
--- a/sysutils/fusefs-gstfs/Makefile
+++ b/sysutils/fusefs-gstfs/Makefile
@@ -15,9 +15,7 @@ PKGNAMEPREFIX=	fusefs-
 MAINTAINER=	dhn@FreeBSD.org
 COMMENT=	On-demand, transcoding filesystem (using GStreamer pipeline)
 
-RUN_DEPENDS=	${LOCALBASE}/modules/fuse.ko:${PORTSDIR}/sysutils/fusefs-kmod
-BUILD_DEPENDS=	${LOCALBASE}/include/fuse.h:${PORTSDIR}/sysutils/fusefs-libs
-
+USE_FUSE=	yes
 USE_GNOME=	pkgconfig
 USE_GSTREAMER=	yes
 
diff --git a/sysutils/fusefs-gunzip/Makefile b/sysutils/fusefs-gunzip/Makefile
index 091f5f642b20..38c92b3ccf0e 100644
--- a/sysutils/fusefs-gunzip/Makefile
+++ b/sysutils/fusefs-gunzip/Makefile
@@ -13,10 +13,8 @@ MASTER_SITES=	http://fuse.gunzip.silverice.org/files/
 MAINTAINER=	jirnov@gmail.com
 COMMENT=	Fuse.gunzip provides transparent decompression of gzip compressed files
 
-BUILD_DEPENDS=	${LOCALBASE}/include/fuse.h:${PORTSDIR}/sysutils/fusefs-libs
-RUN_DEPENDS=	${LOCALBASE}/modules/fuse.ko:${PORTSDIR}/sysutils/fusefs-kmod
-
 WRKSRC=		${WRKDIR}/fuse.gunzip
+USE_FUSE=	yes
 
 PLIST_FILES=	bin/fuse.gunzip
 
diff --git a/sysutils/fusefs-httpfs/Makefile b/sysutils/fusefs-httpfs/Makefile
index 9b1426a76194..01ca1e3e2b79 100644
--- a/sysutils/fusefs-httpfs/Makefile
+++ b/sysutils/fusefs-httpfs/Makefile
@@ -15,9 +15,7 @@ DISTNAME=	${PORTNAME}_with_static_binaries_${PORTVERSION}
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Fuse-based http filesystem
 
-RUN_DEPENDS=	${LOCALBASE}/modules/fuse.ko:${PORTSDIR}/sysutils/fusefs-kmod
-BUILD_DEPENDS=	${LOCALBASE}/include/fuse.h:${PORTSDIR}/sysutils/fusefs-libs
-
+USE_FUSE=	yes
 PLIST_FILES=	bin/httpfs
 WRKSRC=		${WRKDIR}
 
diff --git a/sysutils/fusefs-ifuse/Makefile b/sysutils/fusefs-ifuse/Makefile
index f1694e71d9bb..515865e5cc6a 100644
--- a/sysutils/fusefs-ifuse/Makefile
+++ b/sysutils/fusefs-ifuse/Makefile
@@ -17,16 +17,13 @@ COMMENT=	Mount iPod Touch / iPhone directories over USB
 # LICENSE=	LGPL21
 # LICENSE_FILE=	${WRKSRC}/COPYING
 
-BUILD_DEPENDS=	fusefs-libs>2.4.1:${PORTSDIR}/sysutils/fusefs-libs
+LIB_DEPENDS=	imobiledevice.1:${PORTSDIR}/comms/libimobiledevice
 
-LIB_DEPENDS=	fuse.2:${PORTSDIR}/sysutils/fusefs-libs \
-		imobiledevice.1:${PORTSDIR}/comms/libimobiledevice
-
-RUN_DEPENDS=	${LOCALBASE}/modules/fuse.ko:${PORTSDIR}/sysutils/fusefs-kmod \
-		usbmuxd:${PORTSDIR}/comms/usbmuxd
+RUN_DEPENDS=	usbmuxd:${PORTSDIR}/comms/usbmuxd
 
 SUB_FILES=	pkg-message
 USE_BZIP2=	yes
+USE_FUSE=	yes
 USE_GNOME=	glib20 pkgconfig
 
 GNU_CONFIGURE=	yes
diff --git a/sysutils/fusefs-mhddfs/Makefile b/sysutils/fusefs-mhddfs/Makefile
index 7c59c1f493fb..56643ff9156c 100644
--- a/sysutils/fusefs-mhddfs/Makefile
+++ b/sysutils/fusefs-mhddfs/Makefile
@@ -15,9 +15,7 @@ DISTNAME=	${PORTNAME}_${PORTVERSION}
 MAINTAINER=	proler@gmail.com
 COMMENT=	Multi HDD [FUSE] File System
 
-BUILD_DEPENDS=	${LOCALBASE}/include/fuse.h:${PORTSDIR}/sysutils/fusefs-libs
-RUN_DEPENDS=	${LOCALBASE}/modules/fuse.ko:${PORTSDIR}/sysutils/fusefs-kmod
-
+USE_FUSE=	yes
 USE_GMAKE=	yes
 USE_PKGCONFIG=	build
 MAKE_ARGS=	WITHOUT_XATTR=1
diff --git a/sysutils/fusefs-mp3fs/Makefile b/sysutils/fusefs-mp3fs/Makefile
index ecb2a3b52015..0718d24ab178 100644
--- a/sysutils/fusefs-mp3fs/Makefile
+++ b/sysutils/fusefs-mp3fs/Makefile
@@ -13,16 +13,15 @@ PKGNAMEPREFIX=	fusefs-
 MAINTAINER=	sterum@overrider.at
 COMMENT=	FUSE-based filesystem for transcoding flac to mp3
 
-LIB_DEPENDS=	fuse.2:${PORTSDIR}/sysutils/fusefs-libs\
-		mp3lame.0:${PORTSDIR}/audio/lame\
+LIB_DEPENDS=	mp3lame.0:${PORTSDIR}/audio/lame\
 		FLAC.10:${PORTSDIR}/audio/flac\
 		id3tag.0:${PORTSDIR}/audio/libid3tag
-RUN_DEPENDS=	${LOCALBASE}/modules/fuse.ko:${PORTSDIR}/sysutils/fusefs-kmod
 
 FETCH_CMD=	fetch -Fpr
 
 CFLAGS+=	-L${LOCALBASE}/lib -I${LOCALBASE}/include
 GNU_CONFIGURE=	yes
+USE_FUSE=	yes
 MAN1=		mp3fs.1
 PLIST_FILES=	bin/mp3fs
 
diff --git a/sysutils/fusefs-ntfs/Makefile b/sysutils/fusefs-ntfs/Makefile
index de463a8f1f0e..72944f25de19 100644
--- a/sysutils/fusefs-ntfs/Makefile
+++ b/sysutils/fusefs-ntfs/Makefile
@@ -14,13 +14,11 @@ COMMENT=	Mount NTFS partitions (read/write) and disk images
 
 LICENSE=	GPLv2
 
-BUILD_DEPENDS=	fusefs-libs>=2.7.2:${PORTSDIR}/sysutils/fusefs-libs
-LIB_DEPENDS=	fuse:${PORTSDIR}/sysutils/fusefs-libs
-
 CONFLICTS_BUILD=	bonobo-1.*
 CONFLICTS_INSTALL=	ntfsprogs-*
 USE_LDCONFIG=	yes
 USE_AUTOTOOLS=	libtool
+USE_FUSE=	yes
 USE_ICONV=	yes
 USE_PKGCONFIG=	yes
 CONFIGURE_ARGS=	--exec-prefix=${PREFIX} --disable-mount-helper \
@@ -43,10 +41,6 @@ MAN8=		mkntfs.8 ntfs-3g.8 ntfs-3g.probe.8 \
 
 .include <bsd.port.pre.mk>
 
-.if ${OSVERSION} < 1000021
-RUN_DEPENDS=	${LOCALBASE}/modules/fuse.ko:${PORTSDIR}/sysutils/fusefs-kmod
-.endif
-
 .if ${PORT_OPTIONS:MLOCK}
 CFLAGS+=	-DUSE_LOCK
 .endif
diff --git a/sysutils/fusefs-pod/Makefile b/sysutils/fusefs-pod/Makefile
index 0ff8be8de9b1..216f13f97a48 100644
--- a/sysutils/fusefs-pod/Makefile
+++ b/sysutils/fusefs-pod/Makefile
@@ -15,12 +15,11 @@ DISTNAME=	fusepod-${PORTVERSION}
 MAINTAINER=	fjoe@FreeBSD.org
 COMMENT=	FUSE-based filesystem for iPod
 
-LIB_DEPENDS=	fuse.2:${PORTSDIR}/sysutils/fusefs-libs\
-		gpod.7:${PORTSDIR}/audio/libgpod\
+LIB_DEPENDS=	gpod.7:${PORTSDIR}/audio/libgpod\
 		tag.1:${PORTSDIR}/audio/taglib
-RUN_DEPENDS=	${LOCALBASE}/modules/fuse.ko:${PORTSDIR}/sysutils/fusefs-kmod
 
 USE_BZIP2=	yes
+USE_FUSE=	yes
 GNU_CONFIGURE=	yes
 MAN1=		fusepod.1
 PLIST_FILES=	bin/fusepod
diff --git a/sysutils/fusefs-rar2fs/Makefile b/sysutils/fusefs-rar2fs/Makefile
index 1ebd9578b56a..50c3c112b5b9 100644
--- a/sysutils/fusefs-rar2fs/Makefile
+++ b/sysutils/fusefs-rar2fs/Makefile
@@ -18,8 +18,6 @@ COMMENT=	Mount rar archives as filesystem
 LICENSE=	GPLv3
 
 LIB_DEPENDS=	unrar:${PORTSDIR}/archivers/libunrar4 \
-		fuse:${PORTSDIR}/sysutils/fusefs-libs
-RUN_DEPENDS=	${LOCALBASE}/modules/fuse.ko:${PORTSDIR}/sysutils/fusefs-kmod
 
 GNU_CONFIGURE=	yes
 CONFIGURE_ARGS=	--with-fuse-lib=${LOCALBASE}/lib \
@@ -29,6 +27,7 @@ CONFIGURE_ARGS=	--with-fuse-lib=${LOCALBASE}/lib \
 
 PLIST_FILES=	bin/${PORTNAME}
 MAN1=		rar2fs.1
+USE_FUSE=	yes
 USE_GMAKE=	yes
 
 do-install:
diff --git a/sysutils/fusefs-s3fs/Makefile b/sysutils/fusefs-s3fs/Makefile
index 2bb75402b270..f35b5f229ca1 100644
--- a/sysutils/fusefs-s3fs/Makefile
+++ b/sysutils/fusefs-s3fs/Makefile
@@ -16,11 +16,10 @@ MAINTAINER=	gslin@gslin.org
 COMMENT=	FUSE-based file system backed by Amazon S3
 
 LIB_DEPENDS=	curl:${PORTSDIR}/ftp/curl \
-		fuse:${PORTSDIR}/sysutils/fusefs-libs \
 		xml2:${PORTSDIR}/textproc/libxml2
-RUN_DEPENDS=	${LOCALBASE}/modules/fuse.ko:${PORTSDIR}/sysutils/fusefs-kmod
 
 GNU_CONFIGURE=	yes
+USE_FUSE=	yes
 PLIST_FILES=	bin/s3fs
 
 post-install:
diff --git a/sysutils/fusefs-smbnetfs/Makefile b/sysutils/fusefs-smbnetfs/Makefile
index e99d8524b544..209ec3576dd4 100644
--- a/sysutils/fusefs-smbnetfs/Makefile
+++ b/sysutils/fusefs-smbnetfs/Makefile
@@ -11,16 +11,13 @@ PKGNAMEPREFIX=	fusefs-
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Mount smb shares (Fuse filesystem)
 
-LIB_DEPENDS=	fuse.2:${PORTSDIR}/sysutils/fusefs-libs \
-		smbclient.0:${PORTSDIR}/net/samba-libsmbclient \
+LIB_DEPENDS=	smbclient.0:${PORTSDIR}/net/samba-libsmbclient \
 		gnome-keyring.0:${PORTSDIR}/security/libgnome-keyring
 
 DOCSDIR+=	${PREFIX}/share/doc/${PORTNAME}-${PORTVERSION}
 
-RUN_DEPENDS=	${LOCALBASE}/modules/fuse.ko:${PORTSDIR}/sysutils/fusefs-kmod 
-BUILD_DEPENDS=	fusefs-libs>2.4.1:${PORTSDIR}/sysutils/fusefs-libs
-
 USE_BZIP2=	yes
+USE_FUSE=	yes
 
 GNU_CONFIGURE=	yes
 CFLAGS+=	${PTHREAD_CFLAGS} -I${LOCALBASE}/include
diff --git a/sysutils/fusefs-sqlfs/Makefile b/sysutils/fusefs-sqlfs/Makefile
index 689bf543d208..0994a1c1037f 100644
--- a/sysutils/fusefs-sqlfs/Makefile
+++ b/sysutils/fusefs-sqlfs/Makefile
@@ -18,9 +18,7 @@ DISTNAME=	lib${PORTNAME}-${PORTVERSION}
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	SQLite backed FUSE file system
 
-LIB_DEPENDS=	fuse.2:${PORTSDIR}/sysutils/fusefs-libs
-RUN_DEPENDS=	${LOCALBASE}/modules/fuse.ko:${PORTSDIR}/sysutils/fusefs-kmod
-
+USE_FUSE=	yes
 USE_SQLITE=	3
 
 .if !defined(NOPORTDOCS)
diff --git a/sysutils/fusefs-sshfs/Makefile b/sysutils/fusefs-sshfs/Makefile
index 4d434a4417fc..e05f49a172a5 100644
--- a/sysutils/fusefs-sshfs/Makefile
+++ b/sysutils/fusefs-sshfs/Makefile
@@ -16,12 +16,9 @@ COMMENT=	Mount remote directories over ssh
 
 KMODDIR?=	${LOCALBASE}/modules
 
-LIB_DEPENDS=	fuse.2:${PORTSDIR}/sysutils/fusefs-libs
-RUN_DEPENDS=	${KMODDIR}/fuse.ko:${PORTSDIR}/sysutils/fusefs-kmod
-BUILD_DEPENDS=	fusefs-libs>2.4.1:${PORTSDIR}/sysutils/fusefs-libs
-
 GNU_CONFIGURE=	yes
 CFLAGS+=	${PTHREAD_CFLAGS}
+USE_FUSE=	yes
 USE_GNOME=	glib20
 
 MAN1=	sshfs.1
diff --git a/sysutils/fusefs-unionfs/Makefile b/sysutils/fusefs-unionfs/Makefile
index cd863fab1680..71982c54d3fc 100644
--- a/sysutils/fusefs-unionfs/Makefile
+++ b/sysutils/fusefs-unionfs/Makefile
@@ -15,11 +15,9 @@ DISTNAME=	unionfs-fuse-${PORTVERSION}
 MAINTAINER=	clsung@FreeBSD.org
 COMMENT=	FUSE based implementation of the well-known unionfs
 
-RUN_DEPENDS=	${LOCALBASE}/modules/fuse.ko:${PORTSDIR}/sysutils/fusefs-kmod
-BUILD_DEPENDS=	${LOCALBASE}/include/fuse.h:${PORTSDIR}/sysutils/fusefs-libs
-
 PLIST_FILES=	bin/unionfs
 
+USE_FUSE=	yes
 USE_BZIP2=	yes
 
 do-build:
diff --git a/sysutils/fusefs-wdfs/Makefile b/sysutils/fusefs-wdfs/Makefile
index 50759304c11d..2ad2fc032e24 100644
--- a/sysutils/fusefs-wdfs/Makefile
+++ b/sysutils/fusefs-wdfs/Makefile
@@ -15,11 +15,10 @@ PKGNAMEPREFIX=	fusefs-
 MAINTAINER=	kamikaze@bsdforen.de
 COMMENT=	Mount remote WedDAV directories with Fuse
 
-LIB_DEPENDS=	fuse.2:${PORTSDIR}/sysutils/fusefs-libs \
-		neon.27:${PORTSDIR}/www/neon29
-RUN_DEPENDS=	${LOCALBASE}/modules/fuse.ko:${PORTSDIR}/sysutils/fusefs-kmod
+LIB_DEPENDS=	neon.27:${PORTSDIR}/www/neon29
 
 GNU_CONFIGURE=	yes
+USE_FUSE=	yes
 USE_GNOME=	glib20
 
 PLIST_FILES=	bin/wdfs
diff --git a/sysutils/fusefs-wikipediafs/Makefile b/sysutils/fusefs-wikipediafs/Makefile
index 14504d084496..9cfbcb7c65e2 100644
--- a/sysutils/fusefs-wikipediafs/Makefile
+++ b/sysutils/fusefs-wikipediafs/Makefile
@@ -14,10 +14,9 @@ PKGNAMEPREFIX=	fusefs-
 MAINTAINER=	5u623l20@gmail.com
 COMMENT=	Mount mediawikis
 
-LIB_DEPENDS=	fuse.2:${PORTSDIR}/sysutils/fusefs-libs
-RUN_DEPENDS=	${LOCALBASE}/modules/fuse.ko:${PORTSDIR}/sysutils/fusefs-kmod \
-		py*-fusefs>=0.2:${PORTSDIR}/devel/py-fusefs
+RUN_DEPENDS=	py*-fusefs>=0.2:${PORTSDIR}/devel/py-fusefs
 
+USE_FUSE=	yes
 USE_PYTHON=	yes
 USE_PYDISTUTILS=yes
 PORTDOCS=	AUTHORS ChangeLog HACKING NEWS README TODO
diff --git a/sysutils/moosefs-client/Makefile b/sysutils/moosefs-client/Makefile
index 6d302c17e435..d0456e7cbe52 100644
--- a/sysutils/moosefs-client/Makefile
+++ b/sysutils/moosefs-client/Makefile
@@ -16,9 +16,7 @@ COMMENT=	Moosefs client tools
 
 DISTINFO_FILE=	${.CURDIR}/../moosefs-master/distinfo
 
-BUILD_DEPENDS=	${LOCALBASE}/include/fuse.h:${PORTSDIR}/sysutils/fusefs-libs
-RUN_DEPENDS=	${LOCALBASE}/modules/fuse.ko:${PORTSDIR}/sysutils/fusefs-kmod
-
+USE_FUSE=	yes
 USE_PKGCONFIG=	yes
 
 MAN1=		mfstools.1 mfscheckfile.1 mfsdirinfo.1 mfsfileinfo.1 \
diff --git a/sysutils/mtpfs/Makefile b/sysutils/mtpfs/Makefile
index 89a28bf17843..bb9af8b323e3 100644
--- a/sysutils/mtpfs/Makefile
+++ b/sysutils/mtpfs/Makefile
@@ -10,13 +10,12 @@ MASTER_SITES=	http://www.adebenham.com/mtpfs/
 MAINTAINER=	john@pcbsd.org
 COMMENT=	MTP device filesystem
 
-RUN_DEPENDS=	${LOCALBASE}/modules/fuse.ko:${PORTSDIR}/sysutils/fusefs-kmod
 LIB_DEPENDS=	mtp:${PORTSDIR}/audio/libmtp \
-		fuse:${PORTSDIR}/sysutils/fusefs-libs \
 		id3-3.8:${PORTSDIR}/audio/id3lib \
 		id3tag:${PORTSDIR}/audio/libid3tag \
 		mad:${PORTSDIR}/audio/libmad
 
+USE_FUSE=	yes
 USE_GNOME=	glib20
 GNU_CONFIGURE=	yes
 PLIST_FILES=	bin/mtpfs
diff --git a/sysutils/ntfsprogs/Makefile b/sysutils/ntfsprogs/Makefile
index 24f8c1f2a810..dcbd59f687b6 100644
--- a/sysutils/ntfsprogs/Makefile
+++ b/sysutils/ntfsprogs/Makefile
@@ -11,12 +11,11 @@ COMMENT=	Utilities and library to manipulate NTFS partitions
 
 LICENSE=	GPLv2
 
-BUILD_DEPENDS=	fusefs-libs>2.5:${PORTSDIR}/sysutils/fusefs-libs
-
 CONFLICTS_INSTALL=	fusefs-ntfs-*
 
 USE_PKGCONFIG=	build
 USE_BZIP2=	yes
+USE_FUSE=	yes
 USE_LDCONFIG=	yes
 GNU_CONFIGURE=	yes
 CPPFLAGS+=	-I${LOCALBASE}/include
diff --git a/sysutils/p5-Fuse/Makefile b/sysutils/p5-Fuse/Makefile
index 1f537fd5afd7..baa11dfaa252 100644
--- a/sysutils/p5-Fuse/Makefile
+++ b/sysutils/p5-Fuse/Makefile
@@ -12,13 +12,10 @@ PKGNAMEPREFIX=	p5-
 MAINTAINER=	perl@FreeBSD.org
 COMMENT=	Write filesystems in Perl using FUSE
 
-BUILD_DEPENDS=	mount_fusefs:${PORTSDIR}/sysutils/fusefs-kmod
-RUN_DEPENDS=	${LOCALBASE}/include/fuse.h:${PORTSDIR}/sysutils/fusefs-libs
-BUILD_DEPENDS+=	${RUN_DEPENDS}
-
 PERL_CONFIGURE=	yes
 PORTSCOUT=	skipv:0.09_4
 
+USE_FUSE=	yes
 USE_PKGCONFIG=	build
 
 MAN3=		Fuse.3
diff --git a/sysutils/udfclient/Makefile b/sysutils/udfclient/Makefile
index 4ba8b8125068..a0288f9a9b68 100644
--- a/sysutils/udfclient/Makefile
+++ b/sysutils/udfclient/Makefile
@@ -46,8 +46,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
 
-RUN_DEPENDS+=	${LOCALBASE}/modules/fuse.ko:${PORTSDIR}/sysutils/fusefs-kmod
-LIB_DEPENDS+=	fuse.2:${PORTSDIR}/sysutils/fusefs-libs
+USE_FUSE=	yes
 
 PLIST_FILES+=	bin/${UDFCLIENTFS_NAME}
 .endif
author	Florian Smeets <flo@FreeBSD.org>	2012-12-14 15:47:00 +0000
committer	Florian Smeets <flo@FreeBSD.org>	2012-12-14 15:47:00 +0000
commit	d26530b7136cdbbc743cb41cba488928a2fb490e (patch)
tree	2f5c5fe4cb36fc6a28856c97750108bf78f9b5b4 /sysutils
parent	7045030009ee59cfe75c17ba591c3798c3478b68 (diff)