- Update to 0.5.8

- Add option to build FUSE module

PR:		ports/118484
Submitted by:	Andriy Gapon <avg@icyb.net.ua> (maintainer)

5 files changed, 33 insertions, 41 deletions

diff --git a/sysutils/udfclient/Makefile b/sysutils/udfclient/Makefile
index 43dd0af92650..7dae64482a7d 100644
--- a/sysutils/udfclient/Makefile
+++ b/sysutils/udfclient/Makefile
@@ -6,14 +6,14 @@
 #
 
 PORTNAME=	udfclient
-PORTVERSION=	0.5.6
+PORTVERSION=	0.5.8
 CATEGORIES=	sysutils
 MASTER_SITES=	http://www.13thmonkey.org/udfclient/releases/ \
 		${MASTER_SITE_NETBSD} \
 		${MASTER_SITE_LOCAL}
 MASTER_SITE_SUBDIR=	miwi
 DISTNAME=	UDFclient.${PORTVERSION}
-EXTRACT_SUFX=	.tgz
+DISTFILES=	${DISTNAME}.tgz
 
 MAINTAINER=	avg@icyb.net.ua
 COMMENT=	Tools for UDF filesystem
@@ -23,6 +23,8 @@ CONFIGURE_ENV+=	with_pthread_cflags="${PTHREAD_CFLAGS}" \
 		with_thread_libs="${PTHREAD_LIBS}"
 MAKE_ARGS+=	INSTALL="${INSTALL_PROGRAM}"
 
+OPTIONS=	FUSE	"udfclientfs via FUSE"	off
+
 PLIST_FILES=	bin/udfdump \
 		bin/udfclient \
 		bin/newfs_udf \
@@ -30,4 +32,26 @@ PLIST_FILES=	bin/udfdump \
 		bin/cd_disect \
 		bin/mmc_format
 
-.include <bsd.port.mk>
+.include <bsd.port.pre.mk>
+
+.if defined(WITH_FUSE)
+UDFCLIENTFS_NAME=	udfclientfs
+UDFCLIENTFS_VERSION=	0.1
+UDFCLIENTFS_DIR=	${WRKDIR}/udfclientfs
+
+MASTER_SITES+=	http://www.icyb.net.ua/~avg/distfiles/:fuse
+DISTFILES+=	${UDFCLIENTFS_NAME}-${UDFCLIENTFS_VERSION}.tgz:fuse
+EXTRA_PATCHES+=	${UDFCLIENTFS_DIR}/${UDFCLIENTFS_NAME}.patch
+
+RUN_DEPENDS+=	${LOCALBASE}/modules/fuse.ko:${PORTSDIR}/sysutils/fusefs-kmod
+LIB_DEPENDS+=	fuse.2:${PORTSDIR}/sysutils/fusefs-libs
+
+PLIST_FILES+=	bin/${UDFCLIENTFS_NAME}
+.endif
+
+post-patch:
+.if defined(WITH_FUSE)
+	${CP} ${UDFCLIENTFS_DIR}/${UDFCLIENTFS_NAME}.c ${WRKSRC}
+.endif
+
+.include <bsd.port.post.mk>
diff --git a/sysutils/udfclient/distinfo b/sysutils/udfclient/distinfo
index 7ad15681662c..2cfc2f314ec6 100644
--- a/sysutils/udfclient/distinfo
+++ b/sysutils/udfclient/distinfo
@@ -1,3 +1,6 @@
-MD5 (UDFclient.0.5.6.tgz) = 56269edf932d0c7becc32943e6d86831
-SHA256 (UDFclient.0.5.6.tgz) = 130926bc7393bccebaab5e684098c07eb9532721fabebe5de1ba7d2516b393e2
-SIZE (UDFclient.0.5.6.tgz) = 237023
+MD5 (UDFclient.0.5.8.tgz) = 6b47cc655901e9c896ae6775eef1d78e
+SHA256 (UDFclient.0.5.8.tgz) = 11c49bbddf1c65243954d4b9e6ef3e5036cd53bda72ff2f8aaa8b4cff8735e2a
+SIZE (UDFclient.0.5.8.tgz) = 234317
+MD5 (udfclientfs-0.1.tgz) = 3ad82f25e54f7ad3ab108e0b80571eae
+SHA256 (udfclientfs-0.1.tgz) = 4537c4707da6098efc0a525f1d6100680051ae754c32c8153cfdbd56aa664d23
+SIZE (udfclientfs-0.1.tgz) = 7194
diff --git a/sysutils/udfclient/files/patch-Makefile.in b/sysutils/udfclient/files/patch-Makefile.in
deleted file mode 100644
index f3a04f0f29d0..000000000000
--- a/sysutils/udfclient/files/patch-Makefile.in
+++ /dev/null
@@ -1,11 +0,0 @@
---- Makefile.in	Sun Jun 26 00:02:51 2005
-+++ Makefile.in	Mon Jul 25 20:34:12 2005
-@@ -33,7 +33,7 @@
- #CFLAGS+= -D__ANONYMOUSUDF__
- 
- #CFLAGS+= -fPIC -DPIC
--POSTOBJ+= @SCSI_LIB@ @THREADLIB@ @TIMELIB@
-+POSTOBJ+= @SCSI_LIB@ @THREADLIB@ #@TIMELIB@
- 
- 
- # For use with the cpuflags package
diff --git a/sysutils/udfclient/files/patch-udf_bswap.h b/sysutils/udfclient/files/patch-udf_bswap.h
deleted file mode 100644
index dfedd566c2df..000000000000
--- a/sysutils/udfclient/files/patch-udf_bswap.h
+++ /dev/null
@@ -1,13 +0,0 @@
---- udf_bswap.h.orig	Wed Mar 23 18:00:36 2005
-+++ udf_bswap.h		Wed Mar 23 19:00:10 2005
-@@ -52,8 +52,10 @@
- /* rest only relevant for big endian machines */
- #if (BYTE_ORDER == BIG_ENDIAN)
- 
-+#if !defined(__FreeBSD__)
- #include <machine/bswap.h>
- #include <sys/bswap.h>
-+#endif
- 
- /* inlines for access to swapped data */
- static __inline u_int16_t udf_rw16 __P((u_int16_t));
diff --git a/sysutils/udfclient/files/patch-udfclient.c b/sysutils/udfclient/files/patch-udfclient.c
deleted file mode 100644
index 37f749b305e4..000000000000
--- a/sysutils/udfclient/files/patch-udfclient.c
+++ /dev/null
@@ -1,11 +0,0 @@
---- udfclient.c.orig	Thu Aug  4 09:07:47 2005
-+++ udfclient.c	Thu Aug  4 09:08:08 2005
-@@ -748,7 +748,7 @@
- void udfclient_mget(int args, char *argv[]) {
- 	struct udf_node *udf_node;
- 	uint64_t start, now, totalsize, avg_speed;
--	char *node_name, *source_name, *target_name;
-+	char *node_name=NULL, *source_name, *target_name;
- 	int   arg, error;
- 
- 	if (args == 0) {