- Support staging

- Convert USE_BZIP2 to USES
- Use new LIB_DEPENDS syntax
- Switch to USES=libtool, drop .la files

2 files changed, 29 insertions, 24 deletions

diff --git a/sysutils/ntfsprogs/Makefile b/sysutils/ntfsprogs/Makefile
index 1de327fc1f20..17bb31af3de0 100644
--- a/sysutils/ntfsprogs/Makefile
+++ b/sysutils/ntfsprogs/Makefile
@@ -2,7 +2,7 @@
 
 PORTNAME=	ntfsprogs
 PORTVERSION=	2.0.0
-PORTREVISION=	3
+PORTREVISION=	4
 CATEGORIES=	sysutils
 MASTER_SITES=	SF/linux-ntfs/NTFS%20Tools%20and%20Library/${PORTVERSION}
 
@@ -13,14 +13,15 @@ LICENSE=	GPLv2
 
 CONFLICTS_INSTALL=	fusefs-ntfs-*
 
-USE_BZIP2=	yes
-USES=		fuse pkgconfig
+USES=		fuse pkgconfig libtool tar:bzip2
 USE_LDCONFIG=	yes
 GNU_CONFIGURE=	yes
 CPPFLAGS+=	-I${LOCALBASE}/include
 LDFLAGS+=	-L${LOCALBASE}/lib
 
-OPTIONS_DEFINE=	GNOMEVFS2 LOCK UBLIO UUID
+PORTDOCS=	*
+
+OPTIONS_DEFINE=	GNOMEVFS2 LOCK UBLIO UUID DOCS
 OPTIONS_DEFAULT=LOCK UBLIO
 
 GNOMEVFS2_DESC=	Install GnomeVFS 2.0 libntfs interface
@@ -28,15 +29,8 @@ 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 \
-	ntfscp.8 ntfsfix.8 ntfsinfo.8 ntfslabel.8 ntfsls.8 ntfsmount.8 \
-	ntfsprogs.8 ntfsresize.8 ntfsundelete.8
-MLINKS=	ntfsmount.8 mount_ntfs-fuse.8
-
 SUB_FILES=	pkg-message
 
-NO_STAGE=	yes
 .include <bsd.port.options.mk>
 
 .if ${PORT_OPTIONS:MGNOMEVFS2}
@@ -63,14 +57,14 @@ CFLAGS+=	-DUSE_LOCK
 .endif
 
 .if ${PORT_OPTIONS:MUUID}
-LIB_DEPENDS+=	uuid:${PORTSDIR}/misc/e2fsprogs-libuuid
+LIB_DEPENDS+=	libuuid.so:${PORTSDIR}/misc/e2fsprogs-libuuid
 CONFIGURE_ARGS+=--enable-uuid
 .else
 CONFIGURE_ARGS+=--disable-uuid
 .endif
 
 .if ${PORT_OPTIONS:MUBLIO}
-LIB_DEPENDS+=	ublio:${PORTSDIR}/devel/libublio
+LIB_DEPENDS+=	libublio.so:${PORTSDIR}/devel/libublio
 CFLAGS+=	-DUSE_UBLIO
 .else
 pre-everything::
@@ -86,11 +80,8 @@ post-patch:
 .endif
 
 post-install:
-.if !defined(NOPORTDOCS)
-	${MKDIR} ${DOCSDIR}
-	${INSTALL_DATA} ${WRKSRC}/README ${DOCSDIR}
-	${INSTALL_DATA} ${FILESDIR}/README.FreeBSD ${DOCSDIR}
-.endif
-	@${ECHO_CMD}; ${CAT} ${PKGMESSAGE}; ${ECHO_CMD}
+	${MKDIR} ${STAGEDIR}${DOCSDIR}
+	${INSTALL_DATA} ${WRKSRC}/README ${STAGEDIR}${DOCSDIR}
+	${INSTALL_DATA} ${FILESDIR}/README.FreeBSD ${STAGEDIR}${DOCSDIR}
 
 .include <bsd.port.post.mk>
diff --git a/sysutils/ntfsprogs/pkg-plist b/sysutils/ntfsprogs/pkg-plist
index 0546a159d624..42884dc22e30 100644
--- a/sysutils/ntfsprogs/pkg-plist
+++ b/sysutils/ntfsprogs/pkg-plist
@@ -40,9 +40,26 @@ include/ntfs/unistr.h
 include/ntfs/version.h
 include/ntfs/volume.h
 lib/libntfs.a
-lib/libntfs.la
 lib/libntfs.so
 lib/libntfs.so.10
+lib/libntfs.so.10.0.0
+man/man8/libntfs-gnomevfs.8.gz
+man/man8/libntfs.8.gz
+man/man8/mkntfs.8.gz
+man/man8/mount_ntfs-fuse.8.gz
+man/man8/ntfscat.8.gz
+man/man8/ntfsclone.8.gz
+man/man8/ntfscluster.8.gz
+man/man8/ntfscmp.8.gz
+man/man8/ntfscp.8.gz
+man/man8/ntfsfix.8.gz
+man/man8/ntfsinfo.8.gz
+man/man8/ntfslabel.8.gz
+man/man8/ntfsls.8.gz
+man/man8/ntfsmount.8.gz
+man/man8/ntfsprogs.8.gz
+man/man8/ntfsresize.8.gz
+man/man8/ntfsundelete.8.gz
 sbin/mkntfs
 sbin/ntfsclone
 sbin/ntfscp
@@ -51,10 +68,7 @@ sbin/ntfsresize
 sbin/ntfsundelete
 %%GNOMEVFS2%%etc/gnome-vfs-2.0/modules/libntfs.conf
 %%GNOMEVFS2%%lib/gnome-vfs-2.0/modules/libntfs-gnomevfs.a
-%%GNOMEVFS2%%lib/gnome-vfs-2.0/modules/libntfs-gnomevfs.la
 %%GNOMEVFS2%%lib/gnome-vfs-2.0/modules/libntfs-gnomevfs.so
 %%GNOMEVFS2%%lib/gnome-vfs-2.0/modules/libntfs-gnomevfs.so.1
-%%PORTDOCS%%%%DOCSDIR%%/README
-%%PORTDOCS%%%%DOCSDIR%%/README.FreeBSD
+%%GNOMEVFS2%%lib/gnome-vfs-2.0/modules/libntfs-gnomevfs.so.1.0.0
 @dirrm include/ntfs
-%%PORTDOCS%%@dirrm %%DOCSDIR%%