- Bump PORTREVISION.

- Depend on devel/libublio instead of fetching sources and integrating them.
- Install symlink in /usr/sbin/mount_ntfs-3g, to allow using with
  'mount -t ntfs-3g' and in /etc/fstab, after mounting /usr.
- Change default UBLIO_BLOCKSIZE value to 262144.
- Update pkg-message, with notes about the mount_ntfs-3g symlink, and about
  problems with many simultaneous operations (not ublio's problem, but
  incremented when used with a larger blocksize).

7 files changed, 43 insertions, 78 deletions

diff --git a/sysutils/fusefs-ntfs/Makefile b/sysutils/fusefs-ntfs/Makefile
index ac5536d718f3..0998d589e654 100644
--- a/sysutils/fusefs-ntfs/Makefile
+++ b/sysutils/fusefs-ntfs/Makefile
@@ -6,13 +6,12 @@
 
 PORTNAME=	ntfs
 PORTVERSION=	1.826
+PORTREVISION=	1
 CATEGORIES=	sysutils
-MASTER_SITES=	http://www.ntfs-3g.org/:ntfs \
-		${MASTER_SITE_LOCAL:S|$|alepulver/:ublio|}
+MASTER_SITES=	http://www.ntfs-3g.org/
 PKGNAMEPREFIX=	fusefs-
 DISTNAME=	${PORTNAME}-3g-${PORTVERSION}
 EXTRACT_SUFX=	.tgz
-DISTFILES=	${DISTNAME}${EXTRACT_SUFX}:ntfs
 
 MAINTAINER=	alepulver@FreeBSD.org
 COMMENT=	Mount NTFS partitions (read/write) and disk images
@@ -23,15 +22,15 @@ RUN_DEPENDS=	${LOCALBASE}/modules/fuse.ko:${PORTSDIR}/sysutils/fusefs-kmod
 
 USE_LDCONFIG=	yes
 USE_AUTOTOOLS=	libtool:15
-CONFIGURE_TARGET=	--build=${ARCH}-portbld-freebsd${OSREL}
 CONFIGURE_ARGS=	--exec-prefix=${PREFIX}
+CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" LDFLAGS="-L${LOCALBASE}/lib"
+CONFIGURE_TARGET=	--build=${ARCH}-portbld-freebsd${OSREL}
 
 OPTIONS=	LOCK "Lock the device when mounting (avoids access)" off \
 		UBLIO "Enable user space cache for improved speed" on
 
 MAN8=		ntfs-3g.8
-
-UBLIO_SRC=	libublio-20070103
+MLINKS=		ntfs-3g.8 mount_ntfs-3g.8
 
 .include <bsd.port.pre.mk>
 
@@ -44,16 +43,11 @@ CFLAGS+=	-DUSE_LOCK
 .endif
 
 .if defined(WITH_UBLIO)
-DISTFILES+=	${UBLIO_SRC}.tar.gz:ublio
 EXTRA_PATCHES+=	${FILESDIR}/extra-patch-ublio
+LIB_DEPENDS+=	ublio.1:${PORTSDIR}/devel/libublio
 CFLAGS+=	-DUSE_UBLIO
 SUB_FILES+=	pkg-message
 
-post-extract:
-	@cd ${WRKDIR}/${UBLIO_SRC} && \
-		${CP} ublio.c ${WRKSRC}/libntfs-3g && \
-		${CP} *.h ${WRKSRC}/include/ntfs-3g
-
 post-install:
 	@${ECHO_CMD}; ${CAT} ${PKGMESSAGE}; ${ECHO_CMD}
 .else
diff --git a/sysutils/fusefs-ntfs/distinfo b/sysutils/fusefs-ntfs/distinfo
index 06ecc7560680..024d9392d2d9 100644
--- a/sysutils/fusefs-ntfs/distinfo
+++ b/sysutils/fusefs-ntfs/distinfo
@@ -1,6 +1,3 @@
 MD5 (ntfs-3g-1.826.tgz) = b8bf23a3844ec00d758f04a6b88549ae
 SHA256 (ntfs-3g-1.826.tgz) = d777ddb86ca3a19b9862af5357518d918975055be8f0d737470d31f82d79dd2a
 SIZE (ntfs-3g-1.826.tgz) = 583379
-MD5 (libublio-20070103.tar.gz) = ec8b05fe4d831111f29485b0ab8a0161
-SHA256 (libublio-20070103.tar.gz) = 7c87d1cd7a65ab5ab61f9d7b5279bab6c8169d33d552148d396995c767be919f
-SIZE (libublio-20070103.tar.gz) = 17238
diff --git a/sysutils/fusefs-ntfs/files/extra-patch-ublio b/sysutils/fusefs-ntfs/files/extra-patch-ublio
index 11f97fdba517..137055869d3b 100644
--- a/sysutils/fusefs-ntfs/files/extra-patch-ublio
+++ b/sysutils/fusefs-ntfs/files/extra-patch-ublio
@@ -1,15 +1,14 @@
---- ./libntfs-3g/Makefile.am.orig	Fri Apr  6 17:22:09 2007
-+++ ./libntfs-3g/Makefile.am	Mon Apr 30 13:34:44 2007
-@@ -54,7 +54,8 @@
- 	security.c	\
- 	unistr.c	\
- 	version.c	\
--	volume.c
-+	volume.c \
-+	ublio.c
- 
- AM_CPPFLAGS = $(linux_ntfsincludedir) $(all_includes)
- 
+--- libntfs-3g/Makefile.in.orig	Sat Aug 25 18:23:50 2007
++++ libntfs-3g/Makefile.in	Mon Sep 10 14:38:59 2007
+@@ -82,7 +82,7 @@
+ am__installdirs = "$(DESTDIR)$(libdir)"
+ libLTLIBRARIES_INSTALL = $(INSTALL)
+ LTLIBRARIES = $(lib_LTLIBRARIES) $(noinst_LTLIBRARIES)
+-libntfs_3g_la_LIBADD =
++libntfs_3g_la_LIBADD = -lublio
+ am_libntfs_3g_la_OBJECTS = libntfs_3g_la-attrib.lo \
+ 	libntfs_3g_la-attrlist.lo libntfs_3g_la-bitmap.lo \
+ 	libntfs_3g_la-bootsect.lo libntfs_3g_la-collate.lo \
 --- ./src/ntfs-3g.c.orig	Sun Apr 15 20:52:01 2007
 +++ ./src/ntfs-3g.c	Mon Apr 30 14:12:57 2007
 @@ -1603,7 +1603,11 @@
@@ -24,46 +23,3 @@
  	.destroy        = ntfs_fuse_destroy2,
  #ifdef HAVE_SETXATTR
  	.getxattr	= ntfs_fuse_getxattr,
---- libntfs-3g/Makefile.in.orig	Sun Apr 15 20:50:19 2007
-+++ libntfs-3g/Makefile.in	Mon Apr 30 14:49:21 2007
-@@ -97,7 +97,7 @@
- 	libntfs_3g_la-misc.lo libntfs_3g_la-mst.lo \
- 	libntfs_3g_la-runlist.lo libntfs_3g_la-security.lo \
- 	libntfs_3g_la-unistr.lo libntfs_3g_la-version.lo \
--	libntfs_3g_la-volume.lo
-+	libntfs_3g_la-volume.lo libntfs_3g_la-ublio.lo
- libntfs_3g_la_OBJECTS = $(am_libntfs_3g_la_OBJECTS)
- DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir)
- depcomp = $(SHELL) $(top_srcdir)/depcomp
-@@ -261,7 +261,8 @@
- 	security.c	\
- 	unistr.c	\
- 	version.c	\
--	volume.c
-+	volume.c	\
-+	ublio.c
- 
- AM_CPPFLAGS = $(linux_ntfsincludedir) $(all_includes)
- EXTRA_DIST = unix_io.c
-@@ -359,6 +360,7 @@
- @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libntfs_3g_la-unistr.Plo@am__quote@
- @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libntfs_3g_la-version.Plo@am__quote@
- @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libntfs_3g_la-volume.Plo@am__quote@
-+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libntfs_3g_la-ublio.Plo@am__quote@
- 
- .c.o:
- @am__fastdepCC_TRUE@	if $(COMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ $<; \
-@@ -546,8 +548,13 @@
- @am__fastdepCC_TRUE@	if $(LIBTOOL) --tag=CC --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libntfs_3g_la_CFLAGS) $(CFLAGS) -MT libntfs_3g_la-volume.lo -MD -MP -MF "$(DEPDIR)/libntfs_3g_la-volume.Tpo" -c -o libntfs_3g_la-volume.lo `test -f 'volume.c' || echo '$(srcdir)/'`volume.c; \
- @am__fastdepCC_TRUE@	then mv -f "$(DEPDIR)/libntfs_3g_la-volume.Tpo" "$(DEPDIR)/libntfs_3g_la-volume.Plo"; else rm -f "$(DEPDIR)/libntfs_3g_la-volume.Tpo"; exit 1; fi
- @AMDEP_TRUE@@am__fastdepCC_FALSE@	source='volume.c' object='libntfs_3g_la-volume.lo' libtool=yes @AMDEPBACKSLASH@
-+libntfs_3g_la-ublio.lo: ublio.c
-+@am__fastdepCC_TRUE@	if $(LIBTOOL) --tag=CC --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libntfs_3g_la_CFLAGS) $(CFLAGS) -MT libntfs_3g_la-ublio.lo -MD -MP -MF "$(DEPDIR)/libntfs_3g_la-ublio.Tpo" -c -o libntfs_3g_la-ublio.lo `test -f 'ublio.c' || echo '$(srcdir)/'`ublio.c; \
-+@am__fastdepCC_TRUE@	then mv -f "$(DEPDIR)/libntfs_3g_la-ublio.Tpo" "$(DEPDIR)/libntfs_3g_la-ublio.Plo"; else rm -f "$(DEPDIR)/libntfs_3g_la-ublio.Tpo"; exit 1; fi
-+@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='ublio.c' object='libntfs_3g_la-ublio.lo' libtool=yes @AMDEPBACKSLASH@
- @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
- @am__fastdepCC_FALSE@	$(LIBTOOL) --tag=CC --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libntfs_3g_la_CFLAGS) $(CFLAGS) -c -o libntfs_3g_la-volume.lo `test -f 'volume.c' || echo '$(srcdir)/'`volume.c
-+@am__fastdepCC_FALSE@	$(LIBTOOL) --tag=CC --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libntfs_3g_la_CFLAGS) $(CFLAGS) -c -o libntfs_3g_la-ublio.lo `test -f 'ublio.c' || echo '$(srcdir)/'`ublio.c
- 
- mostlyclean-libtool:
- 	-rm -f *.lo
diff --git a/sysutils/fusefs-ntfs/files/patch-libntfs-3g__unix_io.c b/sysutils/fusefs-ntfs/files/patch-libntfs-3g__unix_io.c
index 0c729a687e13..647f300e155a 100644
--- a/sysutils/fusefs-ntfs/files/patch-libntfs-3g__unix_io.c
+++ b/sysutils/fusefs-ntfs/files/patch-libntfs-3g__unix_io.c
@@ -32,7 +32,7 @@
 +#define UBLIO_USE_API		1
 +#include "ublio.h"
 +#define UBLIO_DEFAULT_ENABLE	1
-+#define UBLIO_DEFAULT_BLOCKSIZE	1048576
++#define UBLIO_DEFAULT_BLOCKSIZE	262144
 +#define UBLIO_DEFAULT_ITEMS	64
 +#define UBLIO_DEFAULT_GRACE	32
 +#define UBLIO_DEFAULT_SYNC_IO	0
diff --git a/sysutils/fusefs-ntfs/files/patch-src-Makefile.in b/sysutils/fusefs-ntfs/files/patch-src-Makefile.in
index 8762083fe426..c2352df82763 100644
--- a/sysutils/fusefs-ntfs/files/patch-src-Makefile.in
+++ b/sysutils/fusefs-ntfs/files/patch-src-Makefile.in
@@ -1,14 +1,22 @@
---- src/Makefile.in.orig	Fri May  4 20:11:59 2007
-+++ src/Makefile.in	Fri May  4 20:12:14 2007
-@@ -523,9 +523,9 @@
+--- src/Makefile.in.orig	Sat Aug 25 18:23:50 2007
++++ src/Makefile.in	Mon Sep 10 15:23:40 2007
+@@ -528,7 +528,7 @@
  
  info-am:
  
 -install-data-am: install-data-local install-man
 +install-data-am: install-man
  
--install-exec-am: install-binPROGRAMS install-exec-local
-+install-exec-am: install-binPROGRAMS
+ install-exec-am: install-binPROGRAMS install-exec-local
  	@$(NORMAL_INSTALL)
- 	$(MAKE) $(AM_MAKEFLAGS) install-exec-hook
+@@ -590,8 +590,8 @@
+ @RUN_LDCONFIG_TRUE@	$(LDCONFIG)
  
+ install-exec-local:
+-	$(INSTALL) -d $(DESTDIR)/sbin
+-	$(LN_S) -f $(bindir)/ntfs-3g $(DESTDIR)/sbin/mount.ntfs-3g
++	$(INSTALL) -d $(DESTDIR)/usr/sbin
++	$(LN_S) -f $(bindir)/ntfs-3g $(DESTDIR)/usr/sbin/mount_ntfs-3g
+ 
+ install-data-local:
+ 	$(INSTALL) -d $(DESTDIR)$(man8dir)
diff --git a/sysutils/fusefs-ntfs/files/pkg-message.in b/sysutils/fusefs-ntfs/files/pkg-message.in
index f3abf199d3f8..653445f93ccc 100644
--- a/sysutils/fusefs-ntfs/files/pkg-message.in
+++ b/sysutils/fusefs-ntfs/files/pkg-message.in
@@ -15,7 +15,7 @@ To give an idea about tuning, here are the default values with some notes
 (they are only based on some simple benchmarks, and may be wrong):
 
 NTFS_USE_UBLIO	- 1. Disabling it drastically decreases performance.
-UBLIO_BLOCKSIZE	- 1048576 (1MB). Larger improves reading/writing speed of
+UBLIO_BLOCKSIZE	- 262144 (256KB). Larger improves reading/writing speed of
 		  large files, and smaller makes filesystem operations
 		  (creation, deletion, moving, find(1)) perform faster.
 		  Try 2/4MB and 512/256KB for the different approaches. Note
@@ -29,6 +29,10 @@ For example (improves performance over large files):
 
 # env UBLIO_BLOCKSIZE=2097152 ntfs-3g /dev/ad0s1 /mnt
 
+Alternatively these variables could be set in the shell startup file. For
+example if you are using it in /etc/fstab add it to /etc/profile. In that
+case, use "ntfs-3g" as the type.
+
 It is also possible to enforce block aligned I/O on regular files by setting
 the FORCE_ALIGNED_IO variable (it will be set to 512 bytes), but this is only
 useful for testing purposes and in practice has no use.
@@ -37,4 +41,8 @@ Note that higher values for UBLIO_BLOCKSIZE and UBLIO_ITEMS increase the
 memory usage by their product in bytes. By default it consumes 64MB. To
 decrease it to 16MB set UBLIO_BLOCKSIZE to 256KB for example.
 
+When doing many simultaneous file operations sometimes one of them fails. The
+greater UBLIO_BLOCKSIZE is, more chances this has to happen. Small values like
+4096 also work fine.
+
 ==============================================================================
diff --git a/sysutils/fusefs-ntfs/pkg-plist b/sysutils/fusefs-ntfs/pkg-plist
index d09511bf2906..3b6df68e8e04 100644
--- a/sysutils/fusefs-ntfs/pkg-plist
+++ b/sysutils/fusefs-ntfs/pkg-plist
@@ -33,3 +33,5 @@ lib/libntfs-3g.la
 lib/libntfs-3g.so
 lib/libntfs-3g.so.10
 @dirrm include/ntfs-3g
+@cwd /usr
+sbin/mount_ntfs-3g