- Add a knob WITH_DVDHACK that builds cdrecord with a third-party patch

  allowing to record DVD-R[W]s. [1]
  NOTE: Please don't blame Joerg Schilling or ask for support on the
	cdrtools mailing lists if this doesn't work. Also have a look
	at the output of `cdrecord -version`.
- Append '-rscsi' to PKGNAMESUFFIX when built with WITH_RSCSI (equivalent
  is done when built with WITH_DVDHACK).
- Limit the workaround that disables using mlockall(2) to FreeBSD versions
  where it triggers a panic.

Requested by:	pav [1]
Tested by:	Harold Gutch <logix@foobar.franken.de> [1]

2 files changed, 48 insertions, 2 deletions

diff --git a/sysutils/cdrtools-devel/files/extra-patch-drv_mmc.c b/sysutils/cdrtools-devel/files/extra-patch-drv_mmc.c
new file mode 100644
index 000000000000..9dee2f41a62a
--- /dev/null
+++ b/sysutils/cdrtools-devel/files/extra-patch-drv_mmc.c
@@ -0,0 +1,37 @@
+--- cdrecord/drv_mmc.c.orig	Thu Oct  9 01:10:41 2003
++++ cdrecord/drv_mmc.c	Thu Oct  9 01:31:28 2003
+@@ -224,13 +224,13 @@
+          scsi_unload,
+          read_buff_cap,
+          cmd_dummy,                              /* recovery_needed      */
+-         (int(*)__PR((SCSI *, int)))cmd_dummy,   /* recover              */
++         (int(*)__PR((SCSI *, cdr_t *, int)))cmd_dummy, /* recover	*/
+          speed_select_mdvd,
+          select_secsize,
+          next_wr_addr_mdvd,
+          (int(*)__PR((SCSI *, Ulong)))cmd_ill,   /* reserve_track        */
+          scsi_cdr_write,
+-         (int(*)__PR((SCSI *scgp, int, track_t *)))cmd_dummy, /* gen_cue */
++         (int(*)__PR((track_t *, void *, BOOL)))cmd_dummy, /* gen_cue */
+ 	 (int(*)__PR((SCSI *scgp, cdr_t *, track_t *)))cmd_dummy, /* send_cue */
+  	 write_leadin_mmc,
+          open_track_mdvd,
+@@ -702,8 +702,7 @@
+ #endif
+ 	}
+ 	if (is_dvd) {
+-	        errmsgno(EX_BAD, 
+-                "Found DVD media: using cdr_mdvd.\n");  
++		printf("Found DVD media: using cdr_mdvd.\n");  
+                 dp = &cdr_mdvd; 
+ 	}
+ 	return (dp);
+@@ -1083,7 +1082,7 @@
+ 	return (0);
+ }
+ 
+-LOCAL int
++EXPORT int
+ check_writemodes_mdvd(scgp, dp)
+ 	SCSI	*scgp;
+ 	cdr_t	*dp;
diff --git a/sysutils/cdrtools-devel/files/patch-conf::configure b/sysutils/cdrtools-devel/files/patch-conf::configure
index eda23804083c..6cbcfc0b2002 100644
--- a/sysutils/cdrtools-devel/files/patch-conf::configure
+++ b/sysutils/cdrtools-devel/files/patch-conf::configure
@@ -1,10 +1,19 @@
 --- conf/configure.orig	Fri Sep 19 16:47:37 2003
 +++ conf/configure	Fri Sep 19 16:49:26 2003
-@@ -5567,6 +5567,7 @@
+@@ -5564,9 +5564,16 @@
+ extern	int	errno;
+ #endif
+ 
++#if defined (__FreeBSD__) && __FreeBSD__ >= 2
++#include <osreldate.h>
++#endif
++
  int
  main()
  {
-+	exit(1);
++#if defined(__FreeBSD__) && __FreeBSD_version < 501113
++	exit(-1);
++#endif
  	if (mlockall(MCL_CURRENT|MCL_FUTURE) < 0) {
  		if (errno == EINVAL || errno ==  ENOMEM ||
  		    errno == EPERM  || errno ==  EACCES)