From owner-svn-ports-all@FreeBSD.ORG Wed Sep 19 22:25:29 2012 Return-Path: Delivered-To: svn-ports-all@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id CDC42106566C; Wed, 19 Sep 2012 22:25:29 +0000 (UTC) (envelope-from bdrewery@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c]) by mx1.freebsd.org (Postfix) with ESMTP id B753C8FC0C; Wed, 19 Sep 2012 22:25:29 +0000 (UTC) Received: from svn.freebsd.org (localhost [127.0.0.1]) by svn.freebsd.org (8.14.4/8.14.4) with ESMTP id q8JMPTtL083989; Wed, 19 Sep 2012 22:25:29 GMT (envelope-from bdrewery@svn.freebsd.org) Received: (from bdrewery@localhost) by svn.freebsd.org (8.14.4/8.14.4/Submit) id q8JMPTdP083981; Wed, 19 Sep 2012 22:25:29 GMT (envelope-from bdrewery@svn.freebsd.org) Message-Id: <201209192225.q8JMPTdP083981@svn.freebsd.org> From: Bryan Drewery Date: Wed, 19 Sep 2012 22:25:29 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org X-SVN-Group: ports-head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Cc: Subject: svn commit: r304549 - in head/sysutils/fusefs-ntfs: . files X-BeenThere: svn-ports-all@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: SVN commit messages for the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 19 Sep 2012 22:25:29 -0000 Author: bdrewery Date: Wed Sep 19 22:25:28 2012 New Revision: 304549 URL: http://svn.freebsd.org/changeset/ports/304549 Log: - Update to 2012.1.15 - Update to working URL - Remove files integrated upstream - Update to new header - Add LICENSE - Remove ABI versions from LIB_DEPENDS - Convert to new options framework - Remove use of bsd.port.pre.mk - See http://lists.freebsd.org/pipermail/freebsd-fs/2012-September/015166.html for more information on the current status of fuse support Deleted: head/sysutils/fusefs-ntfs/files/patch-ntfsprogs__ntfsclone.c head/sysutils/fusefs-ntfs/files/patch-ntfsprogs__ntfsresize.c head/sysutils/fusefs-ntfs/files/patch-src__ntfs-3g_common.c Modified: head/sysutils/fusefs-ntfs/Makefile head/sysutils/fusefs-ntfs/distinfo head/sysutils/fusefs-ntfs/files/README.FreeBSD head/sysutils/fusefs-ntfs/files/extra-patch-ublio head/sysutils/fusefs-ntfs/files/patch-src-Makefile.in head/sysutils/fusefs-ntfs/pkg-descr head/sysutils/fusefs-ntfs/pkg-plist Modified: head/sysutils/fusefs-ntfs/Makefile ============================================================================== --- head/sysutils/fusefs-ntfs/Makefile Wed Sep 19 21:31:28 2012 (r304548) +++ head/sysutils/fusefs-ntfs/Makefile Wed Sep 19 22:25:28 2012 (r304549) @@ -1,12 +1,8 @@ -# New ports collection makefile for: fusefs-ntfs -# Date created: 25 July 2006 -# Whom: Max Khon +# Created By: Max Khon # $FreeBSD$ -# PORTNAME= ntfs -PORTVERSION= 2011.4.12 -PORTREVISION= 1 +PORTVERSION= 2012.1.15 CATEGORIES= sysutils MASTER_SITES= http://tuxera.com/opensource/ PKGNAMEPREFIX= fusefs- @@ -16,8 +12,10 @@ EXTRACT_SUFX= .tgz MAINTAINER= ports@FreeBSD.org COMMENT= Mount NTFS partitions (read/write) and disk images +LICENSE= GPLv2 + BUILD_DEPENDS= fusefs-libs>=2.7.2:${PORTSDIR}/sysutils/fusefs-libs -LIB_DEPENDS= fuse.2:${PORTSDIR}/sysutils/fusefs-libs +LIB_DEPENDS= fuse:${PORTSDIR}/sysutils/fusefs-libs RUN_DEPENDS= ${LOCALBASE}/modules/fuse.ko:${PORTSDIR}/sysutils/fusefs-kmod CONFLICTS_BUILD= bonobo-1.* @@ -31,8 +29,10 @@ CONFIGURE_ARGS= --exec-prefix=${PREFIX} CPPFLAGS+= -I${WRKSRC}/include/ntfs-3g/ -I${LOCALBASE}/include LDFLAGS+= -L${LOCALBASE}/lib -OPTIONS= LOCK "Lock the device when mounting (avoids access)" on \ - UBLIO "Enable user space cache for improved speed" on +OPTIONS_DEFINE= LOCK UBLIO +OPTIONS_DEFAULT=LOCK UBLIO +LOCK_DESC= Lock the device when mounting (avoids access) +UBLIO_DESC= Enable user space cache for improved speed SUB_FILES= pkg-message DOCSDIR= ${PREFIX}/share/doc/ntfs-3g @@ -42,15 +42,15 @@ MAN8= mkntfs.8 ntfs-3g.8 ntfs-3g.probe. ntfscluster.8 ntfscmp.8 ntfscp.8 ntfsfix.8 ntfsinfo.8 \ ntfslabel.8 ntfsls.8 ntfsprogs.8 ntfsresize.8 ntfsundelete.8 -.include +.include -.if defined(WITH_LOCK) +.if ${PORT_OPTIONS:MLOCK} CFLAGS+= -DUSE_LOCK .endif -.if defined(WITH_UBLIO) +.if ${PORT_OPTIONS:MUBLIO} EXTRA_PATCHES+= ${FILESDIR}/extra-patch-ublio -LIB_DEPENDS+= ublio.1:${PORTSDIR}/devel/libublio +LIB_DEPENDS+= ublio:${PORTSDIR}/devel/libublio CFLAGS+= -DUSE_UBLIO .endif @@ -72,4 +72,4 @@ post-install: .endif @${ECHO_CMD}; ${CAT} ${PKGMESSAGE}; ${ECHO_CMD} -.include +.include Modified: head/sysutils/fusefs-ntfs/distinfo ============================================================================== --- head/sysutils/fusefs-ntfs/distinfo Wed Sep 19 21:31:28 2012 (r304548) +++ head/sysutils/fusefs-ntfs/distinfo Wed Sep 19 22:25:28 2012 (r304549) @@ -1,2 +1,2 @@ -SHA256 (ntfs-3g_ntfsprogs-2011.4.12.tgz) = aa8c747f0bfe819b2387b05e12db8d35e4ac96dcb2432873a0b939e248b2ee05 -SIZE (ntfs-3g_ntfsprogs-2011.4.12.tgz) = 1126704 +SHA256 (ntfs-3g_ntfsprogs-2012.1.15.tgz) = 6f1611c5000de7ca99141a9b853cba2c8dbd86c8e36d5efbe7ba918af773fb25 +SIZE (ntfs-3g_ntfsprogs-2012.1.15.tgz) = 1149907 Modified: head/sysutils/fusefs-ntfs/files/README.FreeBSD ============================================================================== --- head/sysutils/fusefs-ntfs/files/README.FreeBSD Wed Sep 19 21:31:28 2012 (r304548) +++ head/sysutils/fusefs-ntfs/files/README.FreeBSD Wed Sep 19 22:25:28 2012 (r304549) @@ -18,7 +18,7 @@ the FUSE library (a OS independent libra precisely FUSE's library with fuse4bsd's kernel module (port of the kernel dependent part of FUSE). For more information see: -NTFS-3G site: http://ntfs-3g.org/ +NTFS-3G site: http://www.tuxera.com/community/ntfs-3g-download/ FUSE site: http://fuse.sourceforge.net/ fuse4bsd site: http://fuse4bsd.creo.hu/ Modified: head/sysutils/fusefs-ntfs/files/extra-patch-ublio ============================================================================== --- head/sysutils/fusefs-ntfs/files/extra-patch-ublio Wed Sep 19 21:31:28 2012 (r304548) +++ head/sysutils/fusefs-ntfs/files/extra-patch-ublio Wed Sep 19 22:25:28 2012 (r304549) @@ -1,9 +1,9 @@ ---- libntfs-3g/Makefile.in.orig 2011-04-10 20:04:51.000000000 +0200 -+++ libntfs-3g/Makefile.in 2011-04-25 18:54:01.000000000 +0200 -@@ -250,6 +250,7 @@ +--- ./libntfs-3g/Makefile.in.orig 2012-08-29 19:51:35.000000000 -0500 ++++ ./libntfs-3g/Makefile.in 2012-08-29 20:00:20.000000000 -0500 +@@ -251,6 +251,7 @@ + @INSTALL_LIBRARY_FALSE@noinst_LTLIBRARIES = libntfs-3g.la libntfs_3g_la_CFLAGS = $(AM_CFLAGS) -I$(top_srcdir)/include/ntfs-3g libntfs_3g_la_LDFLAGS = -version-info $(LIBNTFS_3G_VERSION) -no-undefined - @FUSE_INTERNAL_TRUE@libntfs_3g_la_LIBADD = $(top_builddir)/libfuse-lite/libfuse-lite.la +libntfs_3g_la_LIBADD = -lublio libntfs_3g_la_SOURCES = acls.c attrib.c attrlist.c bitmap.c bootsect.c \ cache.c collate.c compat.c compress.c debug.c device.c dir.c \ Modified: head/sysutils/fusefs-ntfs/files/patch-src-Makefile.in ============================================================================== --- head/sysutils/fusefs-ntfs/files/patch-src-Makefile.in Wed Sep 19 21:31:28 2012 (r304548) +++ head/sysutils/fusefs-ntfs/files/patch-src-Makefile.in Wed Sep 19 22:25:28 2012 (r304549) @@ -1,31 +1,5 @@ --- 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: Modified: head/sysutils/fusefs-ntfs/pkg-descr ============================================================================== --- head/sysutils/fusefs-ntfs/pkg-descr Wed Sep 19 21:31:28 2012 (r304548) +++ head/sysutils/fusefs-ntfs/pkg-descr Wed Sep 19 22:25:28 2012 (r304549) @@ -4,4 +4,4 @@ Server 2003 and Windows 2000 filesystems functionality is supported, the major exceptions are changing the file ownerships and the access rights. -WWW: http://www.tuxera.com/community/ +WWW: http://www.tuxera.com/community/ntfs-3g-download/ Modified: head/sysutils/fusefs-ntfs/pkg-plist ============================================================================== --- head/sysutils/fusefs-ntfs/pkg-plist Wed Sep 19 21:31:28 2012 (r304548) +++ head/sysutils/fusefs-ntfs/pkg-plist Wed Sep 19 22:25:28 2012 (r304549) @@ -36,6 +36,7 @@ include/ntfs-3g/mst.h include/ntfs-3g/ntfstime.h include/ntfs-3g/object_id.h include/ntfs-3g/param.h +include/ntfs-3g/realpath.h include/ntfs-3g/reparse.h include/ntfs-3g/runlist.h include/ntfs-3g/security.h @@ -47,7 +48,7 @@ include/ntfs-3g/xattrs.h lib/libntfs-3g.a lib/libntfs-3g.la lib/libntfs-3g.so -lib/libntfs-3g.so.81 +lib/libntfs-3g.so.83 libdata/pkgconfig/libntfs-3g.pc sbin/mkntfs sbin/ntfsclone