diff options
| -rw-r--r-- | sysutils/fusefs-ntfs/Makefile | 9 | ||||
| -rw-r--r-- | sysutils/fusefs-ntfs/distinfo | 6 | ||||
| -rw-r--r-- | sysutils/fusefs-ntfs/files/README.FreeBSD | 4 | ||||
| -rw-r--r-- | sysutils/fusefs-ntfs/files/patch-src-Makefile.in | 45 | ||||
| -rw-r--r-- | sysutils/fusefs-ntfs/files/patch-src__lowntfs-3g.c | 17 | ||||
| -rw-r--r-- | sysutils/fusefs-ntfs/pkg-plist | 5 |
6 files changed, 62 insertions, 24 deletions
diff --git a/sysutils/fusefs-ntfs/Makefile b/sysutils/fusefs-ntfs/Makefile index 3d0ab1fc47fe..b8d008c494a1 100644 --- a/sysutils/fusefs-ntfs/Makefile +++ b/sysutils/fusefs-ntfs/Makefile @@ -5,14 +5,14 @@ # PORTNAME= ntfs -PORTVERSION= 2010.3.6 +PORTVERSION= 2010.10.2 CATEGORIES= sysutils MASTER_SITES= http://tuxera.com/opensource/ PKGNAMEPREFIX= fusefs- DISTNAME= ${PORTNAME}-3g-${PORTVERSION} EXTRACT_SUFX= .tgz -MAINTAINER= alepulver@FreeBSD.org +MAINTAINER= ports@FreeBSD.org COMMENT= Mount NTFS partitions (read/write) and disk images BUILD_DEPENDS= fusefs-libs>=2.7.2:${PORTSDIR}/sysutils/fusefs-libs @@ -22,7 +22,8 @@ RUN_DEPENDS= ${LOCALBASE}/modules/fuse.ko:${PORTSDIR}/sysutils/fusefs-kmod USE_LDCONFIG= yes USE_AUTOTOOLS= libtool:22 USE_ICONV= yes -CONFIGURE_ARGS= --exec-prefix=${PREFIX} +CONFIGURE_ARGS= --exec-prefix=${PREFIX} --disable-mount-helper \ + --disable-mtab --with-fuse=external CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" LDFLAGS="-L${LOCALBASE}/lib" OPTIONS= LOCK "Lock the device when mounting (avoids access)" on \ @@ -50,6 +51,8 @@ post-patch: ${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|' \ + ${WRKSRC}/libntfs-3g/Makefile.in .if defined(NOPORTDOCS) @${REINPLACE_CMD} -Ee 's|^(install-data-am:) .*|\1|' \ ${WRKSRC}/Makefile.in diff --git a/sysutils/fusefs-ntfs/distinfo b/sysutils/fusefs-ntfs/distinfo index 87c44e6f0812..ffdc495f4dce 100644 --- a/sysutils/fusefs-ntfs/distinfo +++ b/sysutils/fusefs-ntfs/distinfo @@ -1,3 +1,3 @@ -MD5 (ntfs-3g-2010.3.6.tgz) = 12ce21aa044c6068a4df6e8cbd3c5cfa -SHA256 (ntfs-3g-2010.3.6.tgz) = cca0a36e914824f626b4f6f94318f84ca0d9996ad61e161fe112a6401601895f -SIZE (ntfs-3g-2010.3.6.tgz) = 837069 +MD5 (ntfs-3g-2010.10.2.tgz) = 91405690f25822142cdcb43d03e62d3f +SHA256 (ntfs-3g-2010.10.2.tgz) = 17c7e7f1ea22951bdefaa8aa0e36a011f65fbc76fc3511d16433c46d899e9e71 +SIZE (ntfs-3g-2010.10.2.tgz) = 875186 diff --git a/sysutils/fusefs-ntfs/files/README.FreeBSD b/sysutils/fusefs-ntfs/files/README.FreeBSD index 6747bf452264..2573d2422fd0 100644 --- a/sysutils/fusefs-ntfs/files/README.FreeBSD +++ b/sysutils/fusefs-ntfs/files/README.FreeBSD @@ -47,6 +47,10 @@ To mount at startup you need to have the following line in /etc/rc.conf: fusefs_enable="YES" +Then create the following symlink: + +$ ln -s `which ntfs-3g` /usr/sbin/mount_ntfs-3g + And add the appropiate line to /etc/fstab: the filesystem should be "ntfs-3g" instead of "ntfs", and the additional "late" parameter is required. Example: diff --git a/sysutils/fusefs-ntfs/files/patch-src-Makefile.in b/sysutils/fusefs-ntfs/files/patch-src-Makefile.in index e7c0acdfc553..df436153b12c 100644 --- a/sysutils/fusefs-ntfs/files/patch-src-Makefile.in +++ b/sysutils/fusefs-ntfs/files/patch-src-Makefile.in @@ -1,6 +1,32 @@ ---- src/Makefile.in.orig 2008-05-28 20:08:07.000000000 +0100 -+++ src/Makefile.in 2008-06-14 23:44:30.000000000 +0100 -@@ -638,7 +638,7 @@ +--- src/Makefile.in.orig 2010-03-06 13:12:36.000000000 -0300 ++++ src/Makefile.in 2010-06-21 21:59:54.000000000 -0300 +@@ -255,10 +255,10 @@ + ntfs_3g_LDADD = $(FUSE_LIBS) $(top_builddir)/libntfs-3g/libntfs-3g.la + @REALLYSTATIC_TRUE@ntfs_3g_LDFLAGS = $(AM_LDFLAGS) -all-static + ntfs_3g_CFLAGS = \ ++ -I$(top_srcdir)/include/ntfs-3g \ + $(AM_CFLAGS) \ + -DFUSE_USE_VERSION=26 \ +- $(FUSE_CFLAGS) \ +- -I$(top_srcdir)/include/ntfs-3g ++ $(FUSE_CFLAGS) + + ntfs_3g_SOURCES = ntfs-3g.c + ntfs_3g_probe_LDADD = $(top_builddir)/libntfs-3g/libntfs-3g.la +@@ -267,9 +267,9 @@ + @REALLYSTATIC_TRUE@ntfs_3g_probe_LDFLAGS = $(AM_LDFLAGS) -all-static + @REALLYSTATIC_TRUE@ntfs_3g_usermap_LDFLAGS = $(AM_LDFLAGS) -all-static + @REALLYSTATIC_TRUE@ntfs_3g_secaudit_LDFLAGS = $(AM_LDFLAGS) -all-static +-ntfs_3g_probe_CFLAGS = $(AM_CFLAGS) -I$(top_srcdir)/include/ntfs-3g +-ntfs_3g_usermap_CFLAGS = $(AM_CFLAGS) -I$(top_srcdir)/include/ntfs-3g +-ntfs_3g_secaudit_CFLAGS = $(AM_CFLAGS) -I$(top_srcdir)/include/ntfs-3g ++ntfs_3g_probe_CFLAGS = -I$(top_srcdir)/include/ntfs-3g $(AM_CFLAGS) ++ntfs_3g_usermap_CFLAGS = -I$(top_srcdir)/include/ntfs-3g $(AM_CFLAGS) ++ntfs_3g_secaudit_CFLAGS = -I$(top_srcdir)/include/ntfs-3g $(AM_CFLAGS) + ntfs_3g_probe_SOURCES = ntfs-3g.probe.c + ntfs_3g_usermap_SOURCES = usermap.c + ntfs_3g_secaudit_SOURCES = secaudit.c +@@ -667,7 +667,7 @@ info-am: @@ -8,15 +34,4 @@ +install-data-am: install-man \ install-rootbinPROGRAMS install-rootsbinDATA - install-exec-am: install-binPROGRAMS install-exec-local -@@ -699,8 +699,8 @@ - @RUN_LDCONFIG_TRUE@ $(LDCONFIG) - - @ENABLE_MOUNT_HELPER_TRUE@install-exec-local: install-rootbinPROGRAMS --@ENABLE_MOUNT_HELPER_TRUE@ $(MKDIR_P) "$(DESTDIR)/sbin" --@ENABLE_MOUNT_HELPER_TRUE@ $(LN_S) -f "$(rootbindir)/ntfs-3g" "$(DESTDIR)/sbin/mount.ntfs-3g" -+@ENABLE_MOUNT_HELPER_TRUE@ $(MKDIR_P) "/usr/sbin" -+@ENABLE_MOUNT_HELPER_TRUE@ $(LN_S) -f "$(rootbindir)/ntfs-3g" "/usr/sbin/mount_ntfs-3g" - - install-data-local: install-man8 - $(LN_S) -f ntfs-3g.8 "$(DESTDIR)$(man8dir)/mount.ntfs-3g.8" + install-dvi: install-dvi-am diff --git a/sysutils/fusefs-ntfs/files/patch-src__lowntfs-3g.c b/sysutils/fusefs-ntfs/files/patch-src__lowntfs-3g.c new file mode 100644 index 000000000000..17b17d165015 --- /dev/null +++ b/sysutils/fusefs-ntfs/files/patch-src__lowntfs-3g.c @@ -0,0 +1,17 @@ +--- src/lowntfs-3g.c.orig 2010-10-02 08:22:46.000000000 -0300 ++++ src/lowntfs-3g.c 2010-10-10 22:04:14.000000000 -0300 +@@ -2541,10 +2541,14 @@ + if (ntfs_inode_close(ni)) + set_fuse_error(&ret); + done : ++#ifndef __FreeBSD__ + if (ret < 0) + fuse_reply_err(req, -ret); + else + fuse_reply_bmap(req, lidx); ++#else ++ ; ++#endif + } + + #ifdef HAVE_SETXATTR diff --git a/sysutils/fusefs-ntfs/pkg-plist b/sysutils/fusefs-ntfs/pkg-plist index 4109d10da33d..24c7b40953bb 100644 --- a/sysutils/fusefs-ntfs/pkg-plist +++ b/sysutils/fusefs-ntfs/pkg-plist @@ -1,9 +1,8 @@ +bin/lowntfs-3g bin/ntfs-3g bin/ntfs-3g.probe bin/ntfs-3g.secaudit bin/ntfs-3g.usermap -@exec ln -fs %D/%F /usr/sbin/mount_ntfs-3g -@unexec rm -f /usr/sbin/mount_ntfs-3g include/ntfs-3g/acls.h include/ntfs-3g/attrib.h include/ntfs-3g/attrlist.h @@ -41,7 +40,7 @@ include/ntfs-3g/volume.h lib/libntfs-3g.a lib/libntfs-3g.la lib/libntfs-3g.so -lib/libntfs-3g.so.75 +lib/libntfs-3g.so.80 libdata/pkgconfig/libntfs-3g.pc %%PORTDOCS%%%%DOCSDIR%%/README %%PORTDOCS%%%%DOCSDIR%%/README.FreeBSD |