diff --git a/sysutils/fusefs-ntfs/Makefile b/sysutils/fusefs-ntfs/Makefile index 5338d110ac16..d029b406c992 100644 --- a/sysutils/fusefs-ntfs/Makefile +++ b/sysutils/fusefs-ntfs/Makefile @@ -1,51 +1,48 @@ # Created by: Max Khon PORTNAME= ntfs PORTVERSION= 2017.3.23 CATEGORIES= sysutils MASTER_SITES= http://tuxera.com/opensource/ PKGNAMEPREFIX= fusefs- DISTNAME= ${PORTNAME}-3g_ntfsprogs-${PORTVERSION} MAINTAINER= freebsd@dussan.org COMMENT= Mount NTFS partitions (read/write) and disk images LICENSE= GPLv2+ LICENSE_FILE= ${WRKSRC}/COPYING LIB_DEPENDS= libuuid.so:misc/e2fsprogs-libuuid USES= fuse pkgconfig iconv libtool localbase:ldflags tar:tgz USE_LDCONFIG= yes GNU_CONFIGURE= yes CONFIGURE_ARGS= --exec-prefix=${PREFIX} --disable-mount-helper \ --disable-mtab --with-fuse=external --disable-ldconfig -CPPFLAGS+= -I${WRKSRC}/include/ntfs-3g/ +INSTALL_TARGET= install-strip OPTIONS_DEFINE= LOCK UBLIO DOCS OPTIONS_DEFAULT=LOCK UBLIO LOCK_DESC= Lock the device when mounting (avoids access) LOCK_CFLAGS= -DUSE_LOCK UBLIO_DESC= Enable user space cache for improved speed UBLIO_EXTRA_PATCHES= ${FILESDIR}/extra-patch-ublio UBLIO_LIB_DEPENDS= libublio.so:devel/libublio UBLIO_CFLAGS= -DUSE_UBLIO SUB_FILES= pkg-message DOCSDIR= ${PREFIX}/share/doc/ntfs-3g post-patch: @${REINPLACE_CMD} -e 's|ENODATA|ENOATTR|' \ ${WRKSRC}/libntfs-3g/object_id.c \ ${WRKSRC}/libntfs-3g/reparse.c \ ${WRKSRC}/libntfs-3g/security.c @${REINPLACE_CMD} -e 's|\($$(AM_CFLAGS)\) \(-I$$(top_srcdir)/include/ntfs-3g\)|\2 \1|; \ /install-exec-hook:/,/^$$/ s|^@.*||' ${WRKSRC}/libntfs-3g/Makefile.in -post-install: - ${STRIP_CMD} ${STAGEDIR}${PREFIX}/lib/libntfs-3g.so - post-install-DOCS-on: ${INSTALL_DATA} ${FILESDIR}/README.FreeBSD ${STAGEDIR}${DOCSDIR}/ .include diff --git a/sysutils/fusefs-ntfs/files/patch-configure b/sysutils/fusefs-ntfs/files/patch-configure index c68919755849..cee7cc4a9090 100644 --- a/sysutils/fusefs-ntfs/files/patch-configure +++ b/sysutils/fusefs-ntfs/files/patch-configure @@ -1,29 +1,30 @@ ---- configure.orig 2015-03-14 14:10:24 UTC +--- configure.orig 2017-03-23 09:42:56 UTC +++ configure -@@ -3256,7 +3256,7 @@ if test "${enable_mount_helper+set}" = s - else +@@ -12871,7 +12871,7 @@ $as_echo_n "checking fuse compatibility... " >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: checking fuse compatibility" >&5 + $as_echo_n "checking fuse compatibility... " >&6; } + case "${target_os}" in +- linux*|solaris*) ++ freebsd*|linux*|solaris*) - case "${target_os}" in -- linux*) enable_mount_helper="yes" ;; -+ linux*|freebsd*) enable_mount_helper="yes" ;; - *) enable_mount_helper="no" ;; - esac - -@@ -12871,7 +12871,7 @@ fi + # Check whether --with-fuse was given. + if test "${with_fuse+set}" = set; then : +@@ -12885,9 +12885,6 @@ fi + darwin*|netbsd*|kfreebsd*-gnu) with_fuse="external" ;; - freebsd*) +- freebsd*) - as_fn_error $? "Please see FreeBSD support at http://www.freshports.org/sysutils/fusefs-ntfs" "$LINENO" 5 -+ with_fuse="external" - ;; +- ;; *) as_fn_error $? "ntfs-3g can be built for Linux, FreeBSD, Mac OS X, NetBSD, and Solaris only." "$LINENO" 5 -@@ -15014,7 +15014,7 @@ if test "x${DISTCHECK_HACK}" != "x"; the + ;; +@@ -15177,7 +15174,7 @@ fi fi # Settings -pkgconfigdir="\$(libdir)/pkgconfig" +pkgconfigdir="\$(prefix)/libdata/pkgconfig" ntfs3gincludedir="\$(includedir)/ntfs-3g" # Executables should be installed to the root filesystem, otherwise # automounting NTFS volumes can fail during boot if the driver binaries