Index: Mk/bsd.port.mk =================================================================== --- Mk/bsd.port.mk (revision 308843) +++ Mk/bsd.port.mk (working copy) @@ -1833,6 +1833,14 @@ .endif .endif # USE_FAM +.if defined(USE_FUSE) +BUILD_DEPENDS+= ${LOCALBASE}/include/fuse.h:${PORTSDIR}/sysutils/fusefs-libs +LIB_DEPENDS+= fuse:${PORTSDIR}/sysutils/fusefs-libs +.if ${OSVERSION} < 1000020 +RUN_DEPENDS+= ${LOCALBASE}/modules/fuse.ko:${PORTSDIR}/sysutils/fusefs-kmod +.endif +.endif + .if defined(USE_RC_SUBR) && ${USE_RC_SUBR:U} != "YES" SUB_FILES+= ${USE_RC_SUBR} .endif Index: audio/uade/Makefile =================================================================== --- audio/uade/Makefile (revision 308843) +++ audio/uade/Makefile (working copy) @@ -44,7 +44,7 @@ .endif .if ${PORT_OPTIONS:MFUSE} -LIB_DEPENDS+= fuse:${PORTSDIR}/sysutils/fusefs-libs +USE_FUSE= yes MAN1+= uadefs.1 PLIST_SUB+= FUSE="" .else Index: devel/gvfs/Makefile =================================================================== --- devel/gvfs/Makefile (revision 308843) +++ devel/gvfs/Makefile (working copy) @@ -39,8 +39,7 @@ .include .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 Index: devel/libewf/Makefile =================================================================== --- devel/libewf/Makefile (revision 308843) +++ devel/libewf/Makefile (working copy) @@ -17,9 +17,8 @@ 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 Index: devel/libvshadow/Makefile =================================================================== --- devel/libvshadow/Makefile (revision 308843) +++ devel/libvshadow/Makefile (working copy) @@ -17,9 +17,7 @@ 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 Index: devel/py-fusefs/Makefile =================================================================== --- devel/py-fusefs/Makefile (revision 308843) +++ devel/py-fusefs/Makefile (working copy) @@ -15,8 +15,7 @@ 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 Index: emulators/open-vm-tools/Makefile =================================================================== --- emulators/open-vm-tools/Makefile (revision 308843) +++ emulators/open-vm-tools/Makefile (working copy) @@ -53,8 +53,7 @@ .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 " Index: graphics/fusefs-gphotofs/Makefile =================================================================== --- graphics/fusefs-gphotofs/Makefile (revision 308843) +++ graphics/fusefs-gphotofs/Makefile (working copy) @@ -15,11 +15,10 @@ 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 Index: net/openafs/Makefile =================================================================== --- net/openafs/Makefile (revision 308843) +++ net/openafs/Makefile (working copy) @@ -80,7 +80,7 @@ ${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 Index: security/truecrypt/Makefile =================================================================== --- security/truecrypt/Makefile (revision 308843) +++ security/truecrypt/Makefile (working copy) @@ -17,14 +17,12 @@ 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 Index: sysutils/afflib/Makefile =================================================================== --- sysutils/afflib/Makefile (revision 308843) +++ sysutils/afflib/Makefile (working copy) @@ -17,13 +17,13 @@ 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 Index: sysutils/archivemount/Makefile =================================================================== --- sysutils/archivemount/Makefile (revision 308843) +++ sysutils/archivemount/Makefile (working copy) @@ -13,15 +13,13 @@ 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 Index: sysutils/avfs/Makefile =================================================================== --- sysutils/avfs/Makefile (revision 308843) +++ sysutils/avfs/Makefile (working copy) @@ -13,9 +13,7 @@ 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 @@ CPPFLAGS+= -I${LOCALBASE}/include -L${LOCALBASE}/lib -liconv GNU_CONFIGURE= yes +USE_FUSE= yes USE_GMAKE= yes USE_BZIP2= yes USE_LDCONFIG= yes Index: sysutils/djmount/Makefile =================================================================== --- sysutils/djmount/Makefile (revision 308843) +++ sysutils/djmount/Makefile (working copy) @@ -10,13 +10,12 @@ 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} \ Index: sysutils/fusefs-afuse/Makefile =================================================================== --- sysutils/fusefs-afuse/Makefile (revision 308843) +++ sysutils/fusefs-afuse/Makefile (working copy) @@ -13,9 +13,6 @@ 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 @@ PORTDOCS= AUTHORS ChangeLog README PLIST_FILES= bin/${PORTNAME} +USE_FUSE= yes USE_PKGCONFIG= yes MAN1= afuse.1 Index: sysutils/fusefs-chironfs/Makefile =================================================================== --- sysutils/fusefs-chironfs/Makefile (revision 308843) +++ sysutils/fusefs-chironfs/Makefile (working copy) @@ -15,12 +15,10 @@ 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= * Index: sysutils/fusefs-cryptofs/Makefile =================================================================== --- sysutils/fusefs-cryptofs/Makefile (revision 308843) +++ sysutils/fusefs-cryptofs/Makefile (working copy) @@ -15,13 +15,12 @@ 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 Index: sysutils/fusefs-curlftpfs/Makefile =================================================================== --- sysutils/fusefs-curlftpfs/Makefile (revision 308843) +++ sysutils/fusefs-curlftpfs/Makefile (working copy) @@ -15,11 +15,10 @@ 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 Index: sysutils/fusefs-encfs/Makefile =================================================================== --- sysutils/fusefs-encfs/Makefile (revision 308843) +++ sysutils/fusefs-encfs/Makefile (working copy) @@ -18,8 +18,6 @@ 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 @@ --with-boost-filesystem=boost_filesystem CPPFLAGS+= -I${LOCALBASE}/include LDFLAGS+= -L${LOCALBASE}/lib +USE_FUSE= yes USE_GMAKE= yes USE_LDCONFIG= yes Index: sysutils/fusefs-exfat/Makefile =================================================================== --- sysutils/fusefs-exfat/Makefile (revision 308843) +++ sysutils/fusefs-exfat/Makefile (working copy) @@ -13,10 +13,9 @@ 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 Index: sysutils/fusefs-ext4fuse/Makefile =================================================================== --- sysutils/fusefs-ext4fuse/Makefile (revision 308843) +++ sysutils/fusefs-ext4fuse/Makefile (working copy) @@ -16,11 +16,9 @@ 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 Index: sysutils/fusefs-funionfs/Makefile =================================================================== --- sysutils/fusefs-funionfs/Makefile (revision 308843) +++ sysutils/fusefs-funionfs/Makefile (working copy) @@ -14,12 +14,10 @@ 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 Index: sysutils/fusefs-fur/Makefile =================================================================== --- sysutils/fusefs-fur/Makefile (revision 308843) +++ sysutils/fusefs-fur/Makefile (working copy) @@ -15,15 +15,14 @@ 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 Index: sysutils/fusefs-fusexmp_fh/Makefile =================================================================== --- sysutils/fusefs-fusexmp_fh/Makefile (revision 308843) +++ sysutils/fusefs-fusexmp_fh/Makefile (working copy) @@ -15,10 +15,9 @@ 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 Index: sysutils/fusefs-gnome-vfs/Makefile =================================================================== --- sysutils/fusefs-gnome-vfs/Makefile (revision 308843) +++ sysutils/fusefs-gnome-vfs/Makefile (working copy) @@ -15,11 +15,9 @@ 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 Index: sysutils/fusefs-gstfs/Makefile =================================================================== --- sysutils/fusefs-gstfs/Makefile (revision 308843) +++ sysutils/fusefs-gstfs/Makefile (working copy) @@ -15,9 +15,7 @@ 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 Index: sysutils/fusefs-gunzip/Makefile =================================================================== --- sysutils/fusefs-gunzip/Makefile (revision 308843) +++ sysutils/fusefs-gunzip/Makefile (working copy) @@ -13,10 +13,8 @@ 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 Index: sysutils/fusefs-httpfs/Makefile =================================================================== --- sysutils/fusefs-httpfs/Makefile (revision 308843) +++ sysutils/fusefs-httpfs/Makefile (working copy) @@ -15,9 +15,7 @@ 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} Index: sysutils/fusefs-ifuse/Makefile =================================================================== --- sysutils/fusefs-ifuse/Makefile (revision 308843) +++ sysutils/fusefs-ifuse/Makefile (working copy) @@ -17,16 +17,13 @@ # 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= usbmuxd:${PORTSDIR}/comms/usbmuxd -RUN_DEPENDS= ${LOCALBASE}/modules/fuse.ko:${PORTSDIR}/sysutils/fusefs-kmod \ - usbmuxd:${PORTSDIR}/comms/usbmuxd - SUB_FILES= pkg-message USE_BZIP2= yes +USE_FUSE= yes USE_GNOME= glib20 pkgconfig GNU_CONFIGURE= yes Index: sysutils/fusefs-mhddfs/Makefile =================================================================== --- sysutils/fusefs-mhddfs/Makefile (revision 308843) +++ sysutils/fusefs-mhddfs/Makefile (working copy) @@ -15,9 +15,7 @@ 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 Index: sysutils/fusefs-mp3fs/Makefile =================================================================== --- sysutils/fusefs-mp3fs/Makefile (revision 308843) +++ sysutils/fusefs-mp3fs/Makefile (working copy) @@ -13,16 +13,15 @@ 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 Index: sysutils/fusefs-ntfs/Makefile =================================================================== --- sysutils/fusefs-ntfs/Makefile (revision 308843) +++ sysutils/fusefs-ntfs/Makefile (working copy) @@ -14,13 +14,11 @@ 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 @@ .include -.if ${OSVERSION} < 1000021 -RUN_DEPENDS= ${LOCALBASE}/modules/fuse.ko:${PORTSDIR}/sysutils/fusefs-kmod -.endif - .if ${PORT_OPTIONS:MLOCK} CFLAGS+= -DUSE_LOCK .endif Index: sysutils/fusefs-pod/Makefile =================================================================== --- sysutils/fusefs-pod/Makefile (revision 308843) +++ sysutils/fusefs-pod/Makefile (working copy) @@ -15,12 +15,11 @@ 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 Index: sysutils/fusefs-rar2fs/Makefile =================================================================== --- sysutils/fusefs-rar2fs/Makefile (revision 308843) +++ sysutils/fusefs-rar2fs/Makefile (working copy) @@ -18,8 +18,6 @@ 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 @@ PLIST_FILES= bin/${PORTNAME} MAN1= rar2fs.1 +USE_FUSE= yes USE_GMAKE= yes do-install: Index: sysutils/fusefs-s3fs/Makefile =================================================================== --- sysutils/fusefs-s3fs/Makefile (revision 308843) +++ sysutils/fusefs-s3fs/Makefile (working copy) @@ -16,11 +16,10 @@ 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: Index: sysutils/fusefs-smbnetfs/Makefile =================================================================== --- sysutils/fusefs-smbnetfs/Makefile (revision 308843) +++ sysutils/fusefs-smbnetfs/Makefile (working copy) @@ -11,16 +11,13 @@ 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 Index: sysutils/fusefs-sqlfs/Makefile =================================================================== --- sysutils/fusefs-sqlfs/Makefile (revision 308843) +++ sysutils/fusefs-sqlfs/Makefile (working copy) @@ -18,9 +18,7 @@ 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) Index: sysutils/fusefs-sshfs/Makefile =================================================================== --- sysutils/fusefs-sshfs/Makefile (revision 308843) +++ sysutils/fusefs-sshfs/Makefile (working copy) @@ -16,12 +16,9 @@ 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 Index: sysutils/fusefs-unionfs/Makefile =================================================================== --- sysutils/fusefs-unionfs/Makefile (revision 308843) +++ sysutils/fusefs-unionfs/Makefile (working copy) @@ -15,11 +15,9 @@ 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: Index: sysutils/fusefs-wdfs/Makefile =================================================================== --- sysutils/fusefs-wdfs/Makefile (revision 308843) +++ sysutils/fusefs-wdfs/Makefile (working copy) @@ -15,11 +15,10 @@ 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 Index: sysutils/fusefs-wikipediafs/Makefile =================================================================== --- sysutils/fusefs-wikipediafs/Makefile (revision 308843) +++ sysutils/fusefs-wikipediafs/Makefile (working copy) @@ -14,10 +14,9 @@ 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 Index: sysutils/moosefs-client/Makefile =================================================================== --- sysutils/moosefs-client/Makefile (revision 308843) +++ sysutils/moosefs-client/Makefile (working copy) @@ -16,9 +16,7 @@ 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 \ Index: sysutils/mtpfs/Makefile =================================================================== --- sysutils/mtpfs/Makefile (revision 308843) +++ sysutils/mtpfs/Makefile (working copy) @@ -10,13 +10,12 @@ 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 Index: sysutils/ntfsprogs/Makefile =================================================================== --- sysutils/ntfsprogs/Makefile (revision 308843) +++ sysutils/ntfsprogs/Makefile (working copy) @@ -11,12 +11,11 @@ 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 Index: sysutils/p5-Fuse/Makefile =================================================================== --- sysutils/p5-Fuse/Makefile (revision 308843) +++ sysutils/p5-Fuse/Makefile (working copy) @@ -12,13 +12,10 @@ 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 Index: sysutils/udfclient/Makefile =================================================================== --- sysutils/udfclient/Makefile (revision 308843) +++ sysutils/udfclient/Makefile (working copy) @@ -46,8 +46,7 @@ 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 Index: x11-wm/compiz/Makefile =================================================================== --- x11-wm/compiz/Makefile (revision 308843) +++ x11-wm/compiz/Makefile (working copy) @@ -149,8 +149,7 @@ .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