Index: head/sysutils/udfclient/Makefile
===================================================================
--- head/sysutils/udfclient/Makefile	(revision 441706)
+++ head/sysutils/udfclient/Makefile	(revision 441707)
@@ -1,59 +1,57 @@
 # Created by: Andriy Gapon <avg@icyb.net.ua>
 # $FreeBSD$
 
 PORTNAME=	udfclient
-PORTVERSION=	0.7.5
-PORTREVISION=	2
+PORTVERSION=	0.8.8
 CATEGORIES=	sysutils
-MASTER_SITES=	http://www.13thmonkey.org/udfclient/releases/ \
-		NETBSD \
+MASTER_SITES=	OPENBSD/distfiles \
 		LOCAL/miwi
 DISTFILES=	UDFclient.${PORTVERSION}.tgz
 
 MAINTAINER=	avg@icyb.net.ua
 COMMENT=	Tools for UDF filesystem
 
+LICENSE=	ClArtistic
+
 WRKSRC=		${WRKDIR}/UDFclient.${PORTVERSION}
 
 GNU_CONFIGURE=	yes
-MAKE_ARGS+=	INSTALL="${INSTALL_PROGRAM}"
 
 OPTIONS_DEFINE=	FUSE DEBUG
 FUSE_DESC=	udfclientfs via FUSE
 
 PLIST_FILES=	bin/udfdump \
 		bin/udfclient \
 		bin/newfs_udf \
 		bin/cd_sessions \
 		bin/cd_disect \
 		bin/mmc_format
 
 .include <bsd.port.options.mk>
 
 .if ${PORT_OPTIONS:MFUSE}
 UDFCLIENTFS_NAME=	udfclientfs
 UDFCLIENTFS_VERSION=	0.6
 UDFCLIENTFS_DIR=	${WRKDIR}/udfclientfs
 
 MASTER_SITES+=	http://www.icyb.net.ua/~avg/distfiles/:fuse \
 		LOCAL/avg:fuse
 DISTFILES+=	${UDFCLIENTFS_NAME}-${UDFCLIENTFS_VERSION}.tgz:fuse
 EXTRA_PATCHES+=	${UDFCLIENTFS_DIR}/${UDFCLIENTFS_NAME}.patch
+PATCH_ARGS+=	--ignore-whitespace
 
 USES+=		fuse
 
 PLIST_FILES+=	bin/${UDFCLIENTFS_NAME}
 .endif
 
 .if ${PORT_OPTIONS:MDEBUG}
 CFLAGS+=	-O0 -ggdb3
 .endif
 
 post-patch:
 .if ${PORT_OPTIONS:MFUSE}
 	${CP} ${UDFCLIENTFS_DIR}/${UDFCLIENTFS_NAME}.c ${WRKSRC}
 .endif
-	@${REINPLACE_CMD} -e 's,$$(bindir),$$(DESTDIR)$$(bindir),g' \
-		${WRKSRC}/Makefile.in
 
 .include <bsd.port.mk>
Index: head/sysutils/udfclient/distinfo
===================================================================
--- head/sysutils/udfclient/distinfo	(revision 441706)
+++ head/sysutils/udfclient/distinfo	(revision 441707)
@@ -1,5 +1,5 @@
-TIMESTAMP = 1495119494
-SHA256 (UDFclient.0.7.5.tgz) = 73694e186c7b1b4b309abf181a9a7519d0da3dfcace90eb85c5efed0b3c7475b
-SIZE (UDFclient.0.7.5.tgz) = 251270
+TIMESTAMP = 1495723683
+SHA256 (UDFclient.0.8.8.tgz) = 962bd2aa578f9056fba19f920bb8444501020774298dc809d6239c480c96c6c5
+SIZE (UDFclient.0.8.8.tgz) = 257978
 SHA256 (udfclientfs-0.6.tgz) = a115ef941ee56df3a14a3919e7225f046bef9577afbed7e873b1a868b3c0b301
 SIZE (udfclientfs-0.6.tgz) = 27648
Index: head/sysutils/udfclient/files/patch-Makefile.in
===================================================================
--- head/sysutils/udfclient/files/patch-Makefile.in	(nonexistent)
+++ head/sysutils/udfclient/files/patch-Makefile.in	(revision 441707)
@@ -0,0 +1,21 @@
+--- Makefile.in.orig	2017-05-25 17:18:25 UTC
++++ Makefile.in
+@@ -23,6 +23,7 @@ CFLAGS=		@CFLAGS@
+ LDFLAGS=	@LDFLAGS@
+ 
+ INSTALL=	@INSTALL@
++INSTALL_PROGRAM=	@INSTALL_PROGRAM@
+ 
+ # NetBSD
+ #CFLAGS+= -Wall \
+@@ -58,8 +59,8 @@ all: @BUILD_APPS@
+ install: @BUILD_APPS@
+ 	$(INSTALL) -d $(DESTDIR)/$(bindir)
+ 	for app in @BUILD_APPS@; do \
+-		echo "$(INSTALL) $$app $(DESTDIR)/$(bindir)/$$app"; \
+-		$(INSTALL) $$app $(DESTDIR)/$(bindir)/$$app; \
++		echo "$(INSTALL_PROGRAM) $$app $(DESTDIR)/$(bindir)/$$app"; \
++		$(INSTALL_PROGRAM) $$app $(DESTDIR)/$(bindir)/$$app; \
+ 	done
+ 
+ depend:

Property changes on: head/sysutils/udfclient/files/patch-Makefile.in
___________________________________________________________________
Added: fbsd:nokeywords
## -0,0 +1 ##
+yes
\ No newline at end of property
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Added: svn:mime-type
## -0,0 +1 ##
+text/plain
\ No newline at end of property
Index: head/sysutils/udfclient/files/patch-uscsi_subr.c
===================================================================
--- head/sysutils/udfclient/files/patch-uscsi_subr.c	(revision 441706)
+++ head/sysutils/udfclient/files/patch-uscsi_subr.c	(revision 441707)
@@ -1,45 +1,45 @@
---- uscsi_subr.c.orig	2011-11-15 19:51:44.387439246 +0200
-+++ uscsi_subr.c	2011-11-27 16:41:07.706327140 +0200
-@@ -412,6 +412,7 @@ uscsi_command(int flags, struct uscsi_de
+--- uscsi_subr.c.orig	2017-05-25 17:18:25 UTC
++++ uscsi_subr.c
+@@ -412,6 +412,7 @@ uscsi_command(int flags, struct uscsi_dev *disc,
  	struct scsi_sense_data *cam_sense_data;
  	union ccb ccb;
  	uint32_t cam_sense;
 +	u_int sense_len;
  	uint8_t *keypos;
  	int camflags;
  
-@@ -468,17 +469,33 @@ uscsi_command(int flags, struct uscsi_de
+@@ -468,17 +469,33 @@ uscsi_command(int flags, struct uscsi_dev *disc,
  
  	/* print sense info */
  	cam_sense_data = &ccb.csio.sense_data;
 +	sense_len = ccb.csio.sense_len - ccb.csio.sense_resid;
  	if (uscsi_sense) {
 +#if __FreeBSD_version > 900043
 +		int error_code, sense_key;
 +		uint8_t sks[3];
 +
 +		scsi_extract_sense_len(cam_sense_data, sense_len,
 +		    &error_code, &sense_key,
 +		    &uscsi_sense->asc, &uscsi_sense->ascq, /*show_errors*/ 0);
 +
 +		if ((scsi_get_sks(cam_sense_data, sense_len, sks) == 0)) {
 +			uscsi_sense->skey_valid = 1;
 +			uscsi_sense->sense_key  = (sks[1] << 8) | sks[2];
 +		} else
 +			uscsi_sense->skey_valid = 0;
 +#else
  		uscsi_sense->asc  = cam_sense_data->add_sense_code;
  		uscsi_sense->ascq = cam_sense_data->add_sense_code_qual;
  		keypos  = cam_sense_data->sense_key_spec;
  		uscsi_sense->skey_valid =  keypos[0] & 128;
  		uscsi_sense->sense_key  = (keypos[1] << 8) | (keypos[2]);
 +#endif
  	}
  
  	uscsi_print_sense((char *) disc->dev_name,
  		cmd, cmdlen,
 -		(uint8_t *) cam_sense_data, 8 + cam_sense_data->extra_len, 1);
 +		(uint8_t *) cam_sense_data, sense_len, 1);
  
  	return EFAULT;
  }