Skip site navigation (1)Skip section navigation (2)
Date:      Fri, 14 Dec 2012 15:47:01 +0000 (UTC)
From:      Florian Smeets <flo@FreeBSD.org>
To:        ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org
Subject:   svn commit: r308910 - in head: . Mk audio/uade devel/gvfs devel/libewf devel/libvshadow devel/py-fusefs emulators/open-vm-tools graphics/fusefs-gphotofs net/openafs security/truecrypt sysutils/affl...
Message-ID:  <201212141547.qBEFl1D8090281@svn.freebsd.org>

next in thread | raw e-mail | index | archive | help
Author: flo
Date: Fri Dec 14 15:47:00 2012
New Revision: 308910
URL: http://svnweb.freebsd.org/changeset/ports/308910

Log:
  - 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)

Modified:
  head/CHANGES
  head/Mk/bsd.port.mk
  head/audio/uade/Makefile   (contents, props changed)
  head/devel/gvfs/Makefile   (contents, props changed)
  head/devel/libewf/Makefile
  head/devel/libvshadow/Makefile   (contents, props changed)
  head/devel/py-fusefs/Makefile   (contents, props changed)
  head/emulators/open-vm-tools/Makefile   (contents, props changed)
  head/graphics/fusefs-gphotofs/Makefile   (contents, props changed)
  head/net/openafs/Makefile   (contents, props changed)
  head/security/truecrypt/Makefile   (contents, props changed)
  head/sysutils/afflib/Makefile   (contents, props changed)
  head/sysutils/archivemount/Makefile   (contents, props changed)
  head/sysutils/avfs/Makefile
  head/sysutils/djmount/Makefile   (contents, props changed)
  head/sysutils/fusefs-afuse/Makefile   (contents, props changed)
  head/sysutils/fusefs-chironfs/Makefile   (contents, props changed)
  head/sysutils/fusefs-cryptofs/Makefile   (contents, props changed)
  head/sysutils/fusefs-curlftpfs/Makefile   (contents, props changed)
  head/sysutils/fusefs-encfs/Makefile   (contents, props changed)
  head/sysutils/fusefs-exfat/Makefile   (contents, props changed)
  head/sysutils/fusefs-ext4fuse/Makefile   (contents, props changed)
  head/sysutils/fusefs-funionfs/Makefile   (contents, props changed)
  head/sysutils/fusefs-fur/Makefile   (contents, props changed)
  head/sysutils/fusefs-fusexmp_fh/Makefile   (contents, props changed)
  head/sysutils/fusefs-gnome-vfs/Makefile   (contents, props changed)
  head/sysutils/fusefs-gstfs/Makefile   (contents, props changed)
  head/sysutils/fusefs-gunzip/Makefile   (contents, props changed)
  head/sysutils/fusefs-httpfs/Makefile   (contents, props changed)
  head/sysutils/fusefs-ifuse/Makefile   (contents, props changed)
  head/sysutils/fusefs-mhddfs/Makefile   (contents, props changed)
  head/sysutils/fusefs-mp3fs/Makefile   (contents, props changed)
  head/sysutils/fusefs-ntfs/Makefile   (contents, props changed)
  head/sysutils/fusefs-pod/Makefile   (contents, props changed)
  head/sysutils/fusefs-rar2fs/Makefile
  head/sysutils/fusefs-s3fs/Makefile   (contents, props changed)
  head/sysutils/fusefs-smbnetfs/Makefile
  head/sysutils/fusefs-sqlfs/Makefile   (contents, props changed)
  head/sysutils/fusefs-sshfs/Makefile   (contents, props changed)
  head/sysutils/fusefs-unionfs/Makefile   (contents, props changed)
  head/sysutils/fusefs-wdfs/Makefile   (contents, props changed)
  head/sysutils/fusefs-wikipediafs/Makefile   (contents, props changed)
  head/sysutils/moosefs-client/Makefile   (contents, props changed)
  head/sysutils/mtpfs/Makefile
  head/sysutils/ntfsprogs/Makefile   (contents, props changed)
  head/sysutils/p5-Fuse/Makefile   (contents, props changed)
  head/sysutils/udfclient/Makefile   (contents, props changed)
  head/x11-wm/compiz/Makefile   (contents, props changed)

Modified: head/CHANGES
==============================================================================
--- head/CHANGES	Fri Dec 14 15:39:57 2012	(r308909)
+++ head/CHANGES	Fri Dec 14 15:47:00 2012	(r308910)
@@ -10,6 +10,13 @@ in the release notes and/or placed into 
 
 All ports committers are allowed to commit to this file.
 
+20121214:
+AUTHOR: flo@FreeBSD.org
+
+  * Add a USE_FUSE macro to handle fuse dependencies. It makes
+    sure sysutils/fusefs-libs gets installed and depending on 
+    fuse being in base or not it installs sysutils/fusefs-kmod.
+
 20121210:
 AUTHOR: bapt@FreeBSD.org
   * OPTIONS has been extended 2 new macros are available:

Modified: head/Mk/bsd.port.mk
==============================================================================
--- head/Mk/bsd.port.mk	Fri Dec 14 15:39:57 2012	(r308909)
+++ head/Mk/bsd.port.mk	Fri Dec 14 15:47:00 2012	(r308910)
@@ -408,6 +408,9 @@ 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.
@@ -1833,6 +1836,13 @@ IGNORE=		cannot be built with unknown FA
 .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

Modified: head/audio/uade/Makefile
==============================================================================
--- head/audio/uade/Makefile	Fri Dec 14 15:39:57 2012	(r308909)
+++ head/audio/uade/Makefile	Fri Dec 14 15:47:00 2012	(r308910)
@@ -44,7 +44,7 @@ CONFIGURE_ARGS+=--with-text-scope
 .endif
 
 .if ${PORT_OPTIONS:MFUSE}
-LIB_DEPENDS+=	fuse:${PORTSDIR}/sysutils/fusefs-libs
+USE_FUSE=	yes
 MAN1+=		uadefs.1
 PLIST_SUB+=	FUSE=""
 .else

Modified: head/devel/gvfs/Makefile
==============================================================================
--- head/devel/gvfs/Makefile	Fri Dec 14 15:39:57 2012	(r308909)
+++ head/devel/gvfs/Makefile	Fri Dec 14 15:47:00 2012	(r308910)
@@ -39,8 +39,7 @@ OPTIONS=	FUSE "Enable fuse" off \
 .include <bsd.port.pre.mk>
 
 .if defined(WITH_FUSE)
-LIB_DEPENDS+=	fuse.2:${PORTSDIR}/sysutils/fusefs-libs
-RUN_DEPENDS+=	mount_fusefs:${PORTSDIR}/sysutils/fusefs-kmod
+USE_FUSE=	yes
 PLIST_SUB+=	FUSE=""
 .else
 CONFIGURE_ARGS+=	--disable-fuse

Modified: head/devel/libewf/Makefile
==============================================================================
--- head/devel/libewf/Makefile	Fri Dec 14 15:39:57 2012	(r308909)
+++ head/devel/libewf/Makefile	Fri Dec 14 15:47:00 2012	(r308910)
@@ -17,9 +17,8 @@ LICENSE=	GPLv3
 LICENSE_FILE=	${WRKSRC}/COPYING
 
 LIB_DEPENDS=	uuid:${PORTSDIR}/misc/e2fsprogs-libuuid \
-		fuse:${PORTSDIR}/sysutils/fusefs-libs
-RUN_DEPENDS=	${LOCALBASE}/modules/fuse.ko:${PORTSDIR}/sysutils/fusefs-kmod
 
+USE_FUSE=	yes
 USE_GETTEXT=	yes
 USE_ICONV=	yes
 USE_LDCONFIG=	yes

Modified: head/devel/libvshadow/Makefile
==============================================================================
--- head/devel/libvshadow/Makefile	Fri Dec 14 15:39:57 2012	(r308909)
+++ head/devel/libvshadow/Makefile	Fri Dec 14 15:47:00 2012	(r308910)
@@ -17,9 +17,7 @@ COMMENT=	A library to support the Volume
 LICENSE=	GPLv3
 LICENSE_FILE=	${WRKSRC}/COPYING
 
-LIB_DEPENDS=	fuse:${PORTSDIR}/sysutils/fusefs-libs
-RUN_DEPENDS=	${LOCALBASE}/modules/fuse.ko:${PORTSDIR}/sysutils/fusefs-kmod
-
+USE_FUSE=	yes
 USE_GETTEXT=	yes
 USE_ICONV=	yes
 USE_LDCONFIG=	yes

Modified: head/devel/py-fusefs/Makefile
==============================================================================
--- head/devel/py-fusefs/Makefile	Fri Dec 14 15:39:57 2012	(r308909)
+++ head/devel/py-fusefs/Makefile	Fri Dec 14 15:47:00 2012	(r308910)
@@ -15,8 +15,7 @@ DISTNAME=	fuse-python-${DISTVERSION}
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	FUSE Python bindings
 
-LIB_DEPENDS=	fuse.2:${PORTSDIR}/sysutils/fusefs-libs
-
+USE_FUSE=	yes
 USE_PYTHON=	yes
 USE_PKGCONFIG=	yes
 USE_PYDISTUTILS=easy_install

Modified: head/emulators/open-vm-tools/Makefile
==============================================================================
--- head/emulators/open-vm-tools/Makefile	Fri Dec 14 15:39:57 2012	(r308909)
+++ head/emulators/open-vm-tools/Makefile	Fri Dec 14 15:47:00 2012	(r308910)
@@ -53,8 +53,7 @@ CONFLICTS=		open-vm-tools-nox11-[0-9]*
 .endif
 
 .if !defined(WITHOUT_FUSE)
-LIB_DEPENDS+=	fuse.2:${PORTSDIR}/sysutils/fusefs-libs
-RUN_DEPENDS+=	mount_fusefs:${PORTSDIR}/sysutils/fusefs-kmod
+USE_FUSE=	yes
 PLIST_SUB+=	FUSE=""
 .else
 PLIST_SUB+=	FUSE="@comment "

Modified: head/graphics/fusefs-gphotofs/Makefile
==============================================================================
--- head/graphics/fusefs-gphotofs/Makefile	Fri Dec 14 15:39:57 2012	(r308909)
+++ head/graphics/fusefs-gphotofs/Makefile	Fri Dec 14 15:47:00 2012	(r308910)
@@ -15,11 +15,10 @@ PKGNAMEPREFIX=	fusefs-
 MAINTAINER=	pav@FreeBSD.org
 COMMENT=	Mount PTP camera as a file system
 
-LIB_DEPENDS=	fuse.2:${PORTSDIR}/sysutils/fusefs-libs \
-		gphoto2.2:${PORTSDIR}/graphics/libgphoto2
-RUN_DEPENDS=	${LOCALBASE}/modules/fuse.ko:${PORTSDIR}/sysutils/fusefs-kmod
+LIB_DEPENDS=	gphoto2.2:${PORTSDIR}/graphics/libgphoto2
 
 USE_BZIP2=	yes
+USE_FUSE=	yes
 USE_GNOME=	glib20
 GNU_CONFIGURE=	yes
 

Modified: head/net/openafs/Makefile
==============================================================================
--- head/net/openafs/Makefile	Fri Dec 14 15:39:57 2012	(r308909)
+++ head/net/openafs/Makefile	Fri Dec 14 15:47:00 2012	(r308910)
@@ -80,7 +80,7 @@ CONFIGURE_ARGS=	--prefix=${PREFIX} \
 	${CONFIGURE_TARGET}
 
 .if ${PORT_OPTIONS:MFUSE}
-LIB_DEPENDS+=	fuse.2:${PORTSDIR}/sysutils/fusefs-libs
+USE_FUSE=	yes
 PLIST_SUB+=	FUSE=""
 .else
 CONFIGURE_ARGS+=	--disable-fuse-client

Modified: head/security/truecrypt/Makefile
==============================================================================
--- head/security/truecrypt/Makefile	Fri Dec 14 15:39:57 2012	(r308909)
+++ head/security/truecrypt/Makefile	Fri Dec 14 15:47:00 2012	(r308910)
@@ -17,14 +17,12 @@ EXTRACT_ONLY=	${TC_SRCFILE} wxWidgets-${
 MAINTAINER=	zi@FreeBSD.org
 COMMENT=	Free open-source disk encryption software
 
-BUILD_DEPENDS=	${LOCALBASE}/modules/fuse.ko:${PORTSDIR}/sysutils/fusefs-kmod \
-		nasm:${PORTSDIR}/devel/nasm
-LIB_DEPENDS=	fuse.2:${PORTSDIR}/sysutils/fusefs-libs
-RUN_DEPENDS=	${LOCALBASE}/modules/fuse.ko:${PORTSDIR}/sysutils/fusefs-kmod \
-		sudo:${PORTSDIR}/security/sudo
+BUILD_DEPENDS=	nasm:${PORTSDIR}/devel/nasm
+RUN_DEPENDS=	sudo:${PORTSDIR}/security/sudo
 
 WRKSRC=		${WRKDIR}/truecrypt-${PORTVERSION}-source
 
+USE_FUSE=	yes
 USE_GMAKE=	yes
 USE_ICONV=	yes
 RESTRICTED=	Downloading requires acceptance of license agreement

Modified: head/sysutils/afflib/Makefile
==============================================================================
--- head/sysutils/afflib/Makefile	Fri Dec 14 15:39:57 2012	(r308909)
+++ head/sysutils/afflib/Makefile	Fri Dec 14 15:47:00 2012	(r308910)
@@ -17,13 +17,13 @@ COMMENT=	The Advanced Forensics Format l
 
 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

Modified: head/sysutils/archivemount/Makefile
==============================================================================
--- head/sysutils/archivemount/Makefile	Fri Dec 14 15:39:57 2012	(r308909)
+++ head/sysutils/archivemount/Makefile	Fri Dec 14 15:47:00 2012	(r308910)
@@ -13,15 +13,13 @@ MASTER_SITES=	http://www.cybernoia.de/so
 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

Modified: head/sysutils/avfs/Makefile
==============================================================================
--- head/sysutils/avfs/Makefile	Fri Dec 14 15:39:57 2012	(r308909)
+++ head/sysutils/avfs/Makefile	Fri Dec 14 15:47:00 2012	(r308910)
@@ -13,9 +13,7 @@ MASTER_SITES=	SF/avf/${PORTNAME}/${PORTV
 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

Modified: head/sysutils/djmount/Makefile
==============================================================================
--- head/sysutils/djmount/Makefile	Fri Dec 14 15:39:57 2012	(r308909)
+++ head/sysutils/djmount/Makefile	Fri Dec 14 15:47:00 2012	(r308910)
@@ -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} \

Modified: head/sysutils/fusefs-afuse/Makefile
==============================================================================
--- head/sysutils/fusefs-afuse/Makefile	Fri Dec 14 15:39:57 2012	(r308909)
+++ head/sysutils/fusefs-afuse/Makefile	Fri Dec 14 15:47:00 2012	(r308910)
@@ -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

Modified: head/sysutils/fusefs-chironfs/Makefile
==============================================================================
--- head/sysutils/fusefs-chironfs/Makefile	Fri Dec 14 15:39:57 2012	(r308909)
+++ head/sysutils/fusefs-chironfs/Makefile	Fri Dec 14 15:47:00 2012	(r308910)
@@ -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=	*

Modified: head/sysutils/fusefs-cryptofs/Makefile
==============================================================================
--- head/sysutils/fusefs-cryptofs/Makefile	Fri Dec 14 15:39:57 2012	(r308909)
+++ head/sysutils/fusefs-cryptofs/Makefile	Fri Dec 14 15:47:00 2012	(r308910)
@@ -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
 

Modified: head/sysutils/fusefs-curlftpfs/Makefile
==============================================================================
--- head/sysutils/fusefs-curlftpfs/Makefile	Fri Dec 14 15:39:57 2012	(r308909)
+++ head/sysutils/fusefs-curlftpfs/Makefile	Fri Dec 14 15:47:00 2012	(r308910)
@@ -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

Modified: head/sysutils/fusefs-encfs/Makefile
==============================================================================
--- head/sysutils/fusefs-encfs/Makefile	Fri Dec 14 15:39:57 2012	(r308909)
+++ head/sysutils/fusefs-encfs/Makefile	Fri Dec 14 15:47:00 2012	(r308910)
@@ -18,8 +18,6 @@ COMMENT=	An encrypted pass-through FUSE 
 
 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-serializati
 		--with-boost-filesystem=boost_filesystem
 CPPFLAGS+=	-I${LOCALBASE}/include
 LDFLAGS+=	-L${LOCALBASE}/lib
+USE_FUSE=	yes
 USE_GMAKE=	yes
 USE_LDCONFIG=	yes
 

Modified: head/sysutils/fusefs-exfat/Makefile
==============================================================================
--- head/sysutils/fusefs-exfat/Makefile	Fri Dec 14 15:39:57 2012	(r308909)
+++ head/sysutils/fusefs-exfat/Makefile	Fri Dec 14 15:47:00 2012	(r308910)
@@ -13,10 +13,9 @@ COMMENT=	A full-featured exFAT FS implem
 
 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
 

Modified: head/sysutils/fusefs-ext4fuse/Makefile
==============================================================================
--- head/sysutils/fusefs-ext4fuse/Makefile	Fri Dec 14 15:39:57 2012	(r308909)
+++ head/sysutils/fusefs-ext4fuse/Makefile	Fri Dec 14 15:47:00 2012	(r308910)
@@ -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
 

Modified: head/sysutils/fusefs-funionfs/Makefile
==============================================================================
--- head/sysutils/fusefs-funionfs/Makefile	Fri Dec 14 15:39:57 2012	(r308909)
+++ head/sysutils/fusefs-funionfs/Makefile	Fri Dec 14 15:47:00 2012	(r308910)
@@ -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

Modified: head/sysutils/fusefs-fur/Makefile
==============================================================================
--- head/sysutils/fusefs-fur/Makefile	Fri Dec 14 15:39:57 2012	(r308909)
+++ head/sysutils/fusefs-fur/Makefile	Fri Dec 14 15:47:00 2012	(r308910)
@@ -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

Modified: head/sysutils/fusefs-fusexmp_fh/Makefile
==============================================================================
--- head/sysutils/fusefs-fusexmp_fh/Makefile	Fri Dec 14 15:39:57 2012	(r308909)
+++ head/sysutils/fusefs-fusexmp_fh/Makefile	Fri Dec 14 15:47:00 2012	(r308910)
@@ -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

Modified: head/sysutils/fusefs-gnome-vfs/Makefile
==============================================================================
--- head/sysutils/fusefs-gnome-vfs/Makefile	Fri Dec 14 15:39:57 2012	(r308909)
+++ head/sysutils/fusefs-gnome-vfs/Makefile	Fri Dec 14 15:47:00 2012	(r308910)
@@ -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

Modified: head/sysutils/fusefs-gstfs/Makefile
==============================================================================
--- head/sysutils/fusefs-gstfs/Makefile	Fri Dec 14 15:39:57 2012	(r308909)
+++ head/sysutils/fusefs-gstfs/Makefile	Fri Dec 14 15:47:00 2012	(r308910)
@@ -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
 

Modified: head/sysutils/fusefs-gunzip/Makefile
==============================================================================
--- head/sysutils/fusefs-gunzip/Makefile	Fri Dec 14 15:39:57 2012	(r308909)
+++ head/sysutils/fusefs-gunzip/Makefile	Fri Dec 14 15:47:00 2012	(r308910)
@@ -13,10 +13,8 @@ MASTER_SITES=	http://fuse.gunzip.silveri
 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
 

Modified: head/sysutils/fusefs-httpfs/Makefile
==============================================================================
--- head/sysutils/fusefs-httpfs/Makefile	Fri Dec 14 15:39:57 2012	(r308909)
+++ head/sysutils/fusefs-httpfs/Makefile	Fri Dec 14 15:47:00 2012	(r308910)
@@ -15,9 +15,7 @@ DISTNAME=	${PORTNAME}_with_static_binari
 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}
 

Modified: head/sysutils/fusefs-ifuse/Makefile
==============================================================================
--- head/sysutils/fusefs-ifuse/Makefile	Fri Dec 14 15:39:57 2012	(r308909)
+++ head/sysutils/fusefs-ifuse/Makefile	Fri Dec 14 15:47:00 2012	(r308910)
@@ -17,16 +17,13 @@ COMMENT=	Mount iPod Touch / iPhone direc
 # 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

Modified: head/sysutils/fusefs-mhddfs/Makefile
==============================================================================
--- head/sysutils/fusefs-mhddfs/Makefile	Fri Dec 14 15:39:57 2012	(r308909)
+++ head/sysutils/fusefs-mhddfs/Makefile	Fri Dec 14 15:47:00 2012	(r308910)
@@ -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

Modified: head/sysutils/fusefs-mp3fs/Makefile
==============================================================================
--- head/sysutils/fusefs-mp3fs/Makefile	Fri Dec 14 15:39:57 2012	(r308909)
+++ head/sysutils/fusefs-mp3fs/Makefile	Fri Dec 14 15:47:00 2012	(r308910)
@@ -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
 

Modified: head/sysutils/fusefs-ntfs/Makefile
==============================================================================
--- head/sysutils/fusefs-ntfs/Makefile	Fri Dec 14 15:39:57 2012	(r308909)
+++ head/sysutils/fusefs-ntfs/Makefile	Fri Dec 14 15:47:00 2012	(r308910)
@@ -14,13 +14,11 @@ COMMENT=	Mount NTFS partitions (read/wri
 
 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.
 
 .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

Modified: head/sysutils/fusefs-pod/Makefile
==============================================================================
--- head/sysutils/fusefs-pod/Makefile	Fri Dec 14 15:39:57 2012	(r308909)
+++ head/sysutils/fusefs-pod/Makefile	Fri Dec 14 15:47:00 2012	(r308910)
@@ -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

Modified: head/sysutils/fusefs-rar2fs/Makefile
==============================================================================
--- head/sysutils/fusefs-rar2fs/Makefile	Fri Dec 14 15:39:57 2012	(r308909)
+++ head/sysutils/fusefs-rar2fs/Makefile	Fri Dec 14 15:47:00 2012	(r308910)
@@ -18,8 +18,6 @@ COMMENT=	Mount rar archives as filesyste
 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=${LOCALB
 
 PLIST_FILES=	bin/${PORTNAME}
 MAN1=		rar2fs.1
+USE_FUSE=	yes
 USE_GMAKE=	yes
 
 do-install:

Modified: head/sysutils/fusefs-s3fs/Makefile
==============================================================================
--- head/sysutils/fusefs-s3fs/Makefile	Fri Dec 14 15:39:57 2012	(r308909)
+++ head/sysutils/fusefs-s3fs/Makefile	Fri Dec 14 15:47:00 2012	(r308910)
@@ -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:

Modified: head/sysutils/fusefs-smbnetfs/Makefile
==============================================================================
--- head/sysutils/fusefs-smbnetfs/Makefile	Fri Dec 14 15:39:57 2012	(r308909)
+++ head/sysutils/fusefs-smbnetfs/Makefile	Fri Dec 14 15:47:00 2012	(r308910)
@@ -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

Modified: head/sysutils/fusefs-sqlfs/Makefile
==============================================================================
--- head/sysutils/fusefs-sqlfs/Makefile	Fri Dec 14 15:39:57 2012	(r308909)
+++ head/sysutils/fusefs-sqlfs/Makefile	Fri Dec 14 15:47:00 2012	(r308910)
@@ -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)

Modified: head/sysutils/fusefs-sshfs/Makefile
==============================================================================
--- head/sysutils/fusefs-sshfs/Makefile	Fri Dec 14 15:39:57 2012	(r308909)
+++ head/sysutils/fusefs-sshfs/Makefile	Fri Dec 14 15:47:00 2012	(r308910)
@@ -16,12 +16,9 @@ COMMENT=	Mount remote directories over s
 
 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

Modified: head/sysutils/fusefs-unionfs/Makefile
==============================================================================
--- head/sysutils/fusefs-unionfs/Makefile	Fri Dec 14 15:39:57 2012	(r308909)
+++ head/sysutils/fusefs-unionfs/Makefile	Fri Dec 14 15:47:00 2012	(r308910)
@@ -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:

Modified: head/sysutils/fusefs-wdfs/Makefile
==============================================================================
--- head/sysutils/fusefs-wdfs/Makefile	Fri Dec 14 15:39:57 2012	(r308909)
+++ head/sysutils/fusefs-wdfs/Makefile	Fri Dec 14 15:47:00 2012	(r308910)
@@ -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

Modified: head/sysutils/fusefs-wikipediafs/Makefile
==============================================================================
--- head/sysutils/fusefs-wikipediafs/Makefile	Fri Dec 14 15:39:57 2012	(r308909)
+++ head/sysutils/fusefs-wikipediafs/Makefile	Fri Dec 14 15:47:00 2012	(r308910)
@@ -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

Modified: head/sysutils/moosefs-client/Makefile
==============================================================================
--- head/sysutils/moosefs-client/Makefile	Fri Dec 14 15:39:57 2012	(r308909)
+++ head/sysutils/moosefs-client/Makefile	Fri Dec 14 15:47:00 2012	(r308910)
@@ -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 \

Modified: head/sysutils/mtpfs/Makefile
==============================================================================
--- head/sysutils/mtpfs/Makefile	Fri Dec 14 15:39:57 2012	(r308909)
+++ head/sysutils/mtpfs/Makefile	Fri Dec 14 15:47:00 2012	(r308910)
@@ -10,13 +10,12 @@ MASTER_SITES=	http://www.adebenham.com/m
 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

Modified: head/sysutils/ntfsprogs/Makefile
==============================================================================
--- head/sysutils/ntfsprogs/Makefile	Fri Dec 14 15:39:57 2012	(r308909)
+++ head/sysutils/ntfsprogs/Makefile	Fri Dec 14 15:47:00 2012	(r308910)
@@ -11,12 +11,11 @@ COMMENT=	Utilities and library to manipu
 
 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

Modified: head/sysutils/p5-Fuse/Makefile
==============================================================================
--- head/sysutils/p5-Fuse/Makefile	Fri Dec 14 15:39:57 2012	(r308909)
+++ head/sysutils/p5-Fuse/Makefile	Fri Dec 14 15:47:00 2012	(r308910)
@@ -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

Modified: head/sysutils/udfclient/Makefile
==============================================================================
--- head/sysutils/udfclient/Makefile	Fri Dec 14 15:39:57 2012	(r308909)
+++ head/sysutils/udfclient/Makefile	Fri Dec 14 15:47:00 2012	(r308910)
@@ -46,8 +46,7 @@ MASTER_SITES+=	http://www.icyb.net.ua/~a
 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

Modified: head/x11-wm/compiz/Makefile
==============================================================================
--- head/x11-wm/compiz/Makefile	Fri Dec 14 15:39:57 2012	(r308909)
+++ head/x11-wm/compiz/Makefile	Fri Dec 14 15:47:00 2012	(r308910)
@@ -149,8 +149,7 @@ PLIST_SUB+=	DBUS="@comment "
 
 .if ${PORT_OPTIONS:MFUSE}
 CONFIGURE_ARGS+=	--enable-fuse
-BUILD_DEPENDS+=	${LOCALBASE}/libdata/pkgconfig/fuse.pc:${PORTSDIR}/sysutils/fusefs-libs
-RUN_DEPENDS+=	${LOCALBASE}/libdata/pkgconfig/fuse.pc:${PORTSDIR}/sysutils/fusefs-libs
+USE_FUSE=		yes
 PLIST_SUB+=		FUSE=""
 .else
 CONFIGURE_ARGS+=	--disable-fuse



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201212141547.qBEFl1D8090281>