Index: head/sysutils/dvd+rw-tools/Makefile
===================================================================
--- head/sysutils/dvd+rw-tools/Makefile	(revision 476825)
+++ head/sysutils/dvd+rw-tools/Makefile	(revision 476826)
@@ -1,50 +1,50 @@
 # Created by: Charles Swiger <chuck@pkix.net>
 # $FreeBSD$
 
 PORTNAME=	dvd+rw-tools
 PORTVERSION=	7.1
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	sysutils
 MASTER_SITES=	http://www.pkix.net/mirror/fy.chalmers.se/ \
 		http://fy.chalmers.se/~appro/linux/DVD+RW/tools/
 
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	DVD burning software
 
 LICENSE=	GPLv2
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
 BUILD_DEPENDS=	cdrecord:sysutils/cdrtools
 RUN_DEPENDS=	cdrecord:sysutils/cdrtools
 
 # On some systems, among them one 900044 i386, the do-build-invoked
 # "make" will just do nothing for reasons not yet found, as of
 # dvd+rw-tools 7.1. It is supposed to call
 # (m4 -DOS=`uname -s` Makefile.m4 | make -f - dvd+rw-tools)
 # but returns success right away.
 # Using gmake bypasses this problem for unknown reasons. Please leave it in,
 # until the problem is analyzed and fixed - and please comment the fix here.
 USES=		gmake
 
 BIN_FILES=	dvd+rw-booktype dvd+rw-format dvd+rw-mediainfo \
 		dvd-ram-control growisofs
 PLIST_FILES=	${BIN_FILES:S|^|bin/|} \
 		man/man1/growisofs.1.gz
 PORTDOCS=	index.html
 
 OPTIONS_DEFINE=	DOCS
 
 post-patch:
 	@${REINPLACE_CMD} -e 's/-O2//' ${WRKSRC}/Makefile.m4
 
 do-install:
 .for i in ${BIN_FILES}
 	${INSTALL_PROGRAM} ${WRKSRC}/${i} ${STAGEDIR}${PREFIX}/bin
 .endfor
 	${INSTALL_MAN} ${WRKSRC}/growisofs.1 ${STAGEDIR}${MAN1PREFIX}/man/man1/
 
 do-install-DOCS-on:
 	@${MKDIR} ${STAGEDIR}${DOCSDIR}
 	${INSTALL_DATA} ${WRKSRC}/index.html ${STAGEDIR}${DOCSDIR}
 
 .include <bsd.port.mk>
Index: head/sysutils/dvd+rw-tools/files/patch-Makefile.m4
===================================================================
--- head/sysutils/dvd+rw-tools/files/patch-Makefile.m4	(revision 476825)
+++ head/sysutils/dvd+rw-tools/files/patch-Makefile.m4	(revision 476826)
@@ -1,10 +1,10 @@
 --- Makefile.m4.orig	2008-03-02 17:17:09 UTC
 +++ Makefile.m4
-@@ -13,6 +13,7 @@ ifelse(substr(OS,0,7),[CYGWIN_],[define(
+@@ -13,6 +13,7 @@ ifelse(substr(OS,0,7),[CYGWIN_],[define([OS],[MINGW32]
  ifelse(substr(OS,0,7),[MINGW32],[define([OS],[MINGW32])])
  ifelse(OS,NetBSD,[define([OS],[BSD])CXXFLAGS+=-D__unix])
  ifelse(OS,OpenBSD,[define([OS],[BSD])])
 +ifelse(OS,DragonFly,[define([OS],[BSD])LDLIBS=-lcam])
  ifelse(OS,FreeBSD,[define([OS],[BSD])LDLIBS=-lcam])
  ifelse(OS,IRIX64,[define([OS],[IRIX])])
  
Index: head/sysutils/dvd+rw-tools/files/patch-growisofs__mmc.cpp
===================================================================
--- head/sysutils/dvd+rw-tools/files/patch-growisofs__mmc.cpp	(revision 476825)
+++ head/sysutils/dvd+rw-tools/files/patch-growisofs__mmc.cpp	(revision 476826)
@@ -1,11 +1,26 @@
+# Cannot append data to BD-R DL used more than 25gb
+# https://bugs.freebsd.org/230493 via http://bugs.debian.org/615978
+#
+# growisofs error: close session failed when burning 25gb blu-ray disc
+# https://bugs.freebsd.org/198991 via http://bugs.debian.org/713016 
+
 --- growisofs_mmc.cpp.orig	2008-03-04 17:47:49 UTC
 +++ growisofs_mmc.cpp
-@@ -756,6 +756,8 @@ static void bd_r_format (Scsi_Command &c
+@@ -410,7 +410,7 @@ static unsigned int get_2k_capacity (Scsi_Command &cmd
+ 	    }
  
-     wait_for_unit (cmd);
+ 	    nwa = 0;
+-	    if (buf[7]&1 && !bdr_plus_pow)	// NWA_V
++	    if (buf[7]&1)	// NWA_V
+ 	    {	nwa  = buf[12]<<24;
+ 		nwa |= buf[13]<<16;
+ 		nwa |= buf[14]<<8;
+@@ -755,6 +755,8 @@ static void bd_r_format (Scsi_Command &cmd)
+ 	exit (FATAL_START(errno));
  
-+    bdr_plus_pow = 1;
+     wait_for_unit (cmd);
 +
++    bdr_plus_pow = 1;
+ 
      cmd[0] = 0x35;	// FLUSH CACHE
      cmd[9] = 0;
-     cmd.transport();
Index: head/sysutils/dvd+rw-tools/files/patch-mp.h
===================================================================
--- head/sysutils/dvd+rw-tools/files/patch-mp.h	(revision 476825)
+++ head/sysutils/dvd+rw-tools/files/patch-mp.h	(revision 476826)
@@ -1,12 +1,12 @@
 --- mp.h.orig	2008-02-24 17:56:07 UTC
 +++ mp.h
-@@ -46,7 +46,9 @@ static void *__thread_create(int (*func)
+@@ -46,7 +46,9 @@ static void *__thread_create(int (*func)(void *),void 
  
      if (pthread_attr_init(&attr)==0 &&
  	pthread_attr_setstacksize(&attr,stack_sz)==0 &&
 +#if !defined(__DragonFly__)
  	pthread_attr_setscope(&attr,PTHREAD_SCOPE_SYSTEM)==0 &&
 +#endif
  	pthread_create(&h,&attr,(void *(*)(void *))func,arg)==0 )
  	return (void *)h;
  
Index: head/sysutils/dvd+rw-tools/files/patch-transport.hxx
===================================================================
--- head/sysutils/dvd+rw-tools/files/patch-transport.hxx	(revision 476825)
+++ head/sysutils/dvd+rw-tools/files/patch-transport.hxx	(revision 476826)
@@ -1,11 +1,11 @@
 --- transport.hxx.orig	2008-03-01 10:34:43 UTC
 +++ transport.hxx
-@@ -483,7 +483,7 @@ public:
+@@ -483,7 +483,7 @@ class Scsi_Command { (public)
      {	return 1;   }
  };
  
 -#elif defined(__FreeBSD__)
 +#elif defined(__FreeBSD__) || defined(__DragonFly__)
  
  #include <sys/ioctl.h>
  #include <camlib.h>