From owner-svn-ports-head@FreeBSD.ORG Thu Aug 30 00:29:49 2012
Return-Path: <owner-svn-ports-head@FreeBSD.ORG>
Delivered-To: svn-ports-head@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
by hub.freebsd.org (Postfix) with ESMTP id C998B106564A;
Thu, 30 Aug 2012 00:29:49 +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 B36838FC16;
Thu, 30 Aug 2012 00:29:49 +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 q7U0Tn5D040929;
Thu, 30 Aug 2012 00:29:49 GMT
(envelope-from bdrewery@svn.freebsd.org)
Received: (from bdrewery@localhost)
by svn.freebsd.org (8.14.4/8.14.4/Submit) id q7U0TnCD040926;
Thu, 30 Aug 2012 00:29:49 GMT
(envelope-from bdrewery@svn.freebsd.org)
Message-Id: <201208300029.q7U0TnCD040926@svn.freebsd.org>
From: Bryan Drewery <bdrewery@FreeBSD.org>
Date: Thu, 30 Aug 2012 00:29:49 +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: r303355 - head/sysutils/ntfsprogs
X-BeenThere: svn-ports-head@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: SVN commit messages for the ports tree for head
<svn-ports-head.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/svn-ports-head>,
<mailto:svn-ports-head-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-ports-head>
List-Post: <mailto:svn-ports-head@freebsd.org>
List-Help: <mailto:svn-ports-head-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-ports-head>,
<mailto:svn-ports-head-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Thu, 30 Aug 2012 00:29:50 -0000
Author: bdrewery
Date: Thu Aug 30 00:29:49 2012
New Revision: 303355
URL: http://svn.freebsd.org/changeset/ports/303355
Log:
- Add conflicts with sysutils/fusefs-ntfs [1][2]
- Reset maintainership per private request
- Convert to new options framework
- Remove ABI version from LIB_DEPENDS
- Add LICENSE (GPL2)
- Update to working WWW
PR: ports/169043 [1], ports/170229 [2]
Submitted by: "Julian H. Stacey" <jhs@berklix.com> [1]
Approved by: Samuel Martin Moro <faust64@gmail.com> (maintainer)
Approved by: eadler (mentor)
Modified:
head/sysutils/ntfsprogs/Makefile
head/sysutils/ntfsprogs/pkg-descr
Modified: head/sysutils/ntfsprogs/Makefile
==============================================================================
--- head/sysutils/ntfsprogs/Makefile Wed Aug 29 22:48:55 2012 (r303354)
+++ head/sysutils/ntfsprogs/Makefile Thu Aug 30 00:29:49 2012 (r303355)
@@ -11,11 +11,15 @@ PORTREVISION= 2
CATEGORIES= sysutils
MASTER_SITES= SF/linux-ntfs/NTFS%20Tools%20and%20Library/${PORTVERSION}
-MAINTAINER= faust64@gmail.com
+MAINTAINER= ports@FreeBSD.org
COMMENT= Utilities and library to manipulate NTFS partitions
+LICENSE= GPLv2
+
BUILD_DEPENDS= fusefs-libs>2.5:${PORTSDIR}/sysutils/fusefs-libs
+CONFLICTS_INSTALL= fusefs-ntfs-*
+
USE_GNOME= pkgconfig
USE_BZIP2= yes
USE_LDCONFIG= yes
@@ -23,10 +27,13 @@ GNU_CONFIGURE= yes
CPPFLAGS+= -I${LOCALBASE}/include
LDFLAGS+= -L${LOCALBASE}/lib
-OPTIONS= GNOMEVFS2 "Install GnomeVFS 2.0 libntfs interface" off \
- LOCK "Lock the device when mounting (avoids access)" on \
- UBLIO "Enable user space cache for improved speed" on \
- UUID "Generate DCE compliant UUIDs" off
+OPTIONS_DEFINE= GNOMEVFS2 LOCK UBLIO UUID
+OPTIONS_DEFAULT=LOCK UBLIO
+
+GNOMEVFS2_DESC= Install GnomeVFS 2.0 libntfs interface
+LOCK_DESC= Lock the device when mounting (avoids access)
+UBLIO_DESC= Enable user space cache for improved speed
+UUID_DESC= Generate DCE compliant UUIDs
MAN8= libntfs.8 libntfs-gnomevfs.8 mkntfs.8 \
ntfscat.8 ntfsclone.8 ntfscluster.8 ntfscmp.8 \
@@ -42,7 +49,7 @@ SUB_FILES= pkg-message
CFLAGS:= ${CFLAGS:C/-O.?/-O0/g}
.endif
-.if defined(WITH_GNOMEVFS2)
+.if ${PORT_OPTIONS:MGNOMEVFS2}
CONFIGURE_ARGS+=--enable-gnome-vfs
USE_GNOME= gnomevfs2
PLIST_SUB+= GNOMEVFS2=""
@@ -51,19 +58,19 @@ CONFIGURE_ARGS+=--disable-gnome-vfs
PLIST_SUB+= GNOMEVFS2="@comment "
.endif
-.if defined(WITH_LOCK)
+.if ${PORT_OPTIONS:MLOCK}
CFLAGS+= -DUSE_LOCK
.endif
-.if defined(WITH_UUID)
-LIB_DEPENDS+= uuid.1:${PORTSDIR}/misc/e2fsprogs-libuuid
+.if ${PORT_OPTIONS:MUUID}
+LIB_DEPENDS+= uuid:${PORTSDIR}/misc/e2fsprogs-libuuid
CONFIGURE_ARGS+=--enable-uuid
.else
CONFIGURE_ARGS+=--disable-uuid
.endif
-.if defined(WITH_UBLIO)
-LIB_DEPENDS+= ublio.1:${PORTSDIR}/devel/libublio
+.if ${PORT_OPTIONS:MUBLIO}
+LIB_DEPENDS+= ublio:${PORTSDIR}/devel/libublio
CFLAGS+= -DUSE_UBLIO
.else
pre-everything::
@@ -72,7 +79,7 @@ pre-everything::
@${ECHO_MSG}
.endif
-.if defined(WITH_UBLIO)
+.if ${PORT_OPTIONS:MUBLIO}
post-patch:
@${REINPLACE_CMD} -e 's|^libntfs_la_LIBADD =|& -lublio|' \
${WRKSRC}/libntfs/Makefile.in
Modified: head/sysutils/ntfsprogs/pkg-descr
==============================================================================
--- head/sysutils/ntfsprogs/pkg-descr Wed Aug 29 22:48:55 2012 (r303354)
+++ head/sysutils/ntfsprogs/pkg-descr Thu Aug 30 00:29:49 2012 (r303355)
@@ -9,4 +9,4 @@ ntfsprogs: various tools for managing nt
ntfsclone, ntfsfix, ntfsundelete, ntfswipe and ntfsdecrypt.
-WWW: http://www.linux-ntfs.org/
+WWW: https://sourceforge.net/projects/linux-ntfs/