ports/97100: update port: sysutils/dvd+rw-tools to v6.1
Charles Swiger
chuck at pkix.net
Wed May 10 18:30:21 UTC 2006
>Number: 97100
>Category: ports
>Synopsis: update port: sysutils/dvd+rw-tools to v6.1
>Confidential: no
>Severity: non-critical
>Priority: medium
>Responsible: freebsd-ports-bugs
>State: open
>Quarter:
>Keywords:
>Date-Required:
>Class: maintainer-update
>Submitter-Id: current-users
>Arrival-Date: Wed May 10 18:30:15 GMT 2006
>Closed-Date:
>Last-Modified:
>Originator: Charles Swiger
>Release: FreeBSD 4.11-STABLE i386
>Organization:
PKIx
>Environment:
System: FreeBSD ns1.pkix.net 4.11-STABLE FreeBSD 4.11-STABLE #0: Sat Jun 18 18:51:43 EDT 2005 root at ns1.pkix.net:/usr/obj/usr/src/sys/NORMAL i386
>Description:
Update dvd+rw-tools to latest version and include a patch requested by
bacula users. Based upon PR ports/96192, which can be closed with thanks to
the original submittor, Shane <decept0 at gmail.com>.
files/patch-mp.h can be obsoleted, I believe, as I was able to build 6.1 on
4.x as well as later releases.
>How-To-Repeat:
N/A.
>Fix:
diff -dur dvd+rw-tools.old/Makefile dvd+rw-tools/Makefile
--- dvd+rw-tools.old/Makefile Wed May 10 14:07:50 2006
+++ dvd+rw-tools/Makefile Wed May 10 14:08:13 2006
@@ -5,8 +5,7 @@
# $FreeBSD: ports/sysutils/dvd+rw-tools/Makefile,v 1.21 2006/03/27 16:28:57 lioux Exp $
PORTNAME= dvd+rw-tools
-PORTVERSION= 6.0
-PORTREVISION= 2
+PORTVERSION= 6.1
CATEGORIES= sysutils
MASTER_SITES= http://www.franksworld.org/dist/dvd+rw/ \
http://www.pkix.net/mirror/fy.chalmers.se/ \
@@ -16,9 +15,6 @@
COMMENT= DVD burning software
RUN_DEPENDS= ${LOCALBASE}/bin/mkisofs:${PORTSDIR}/sysutils/cdrtools
-
-USE_REINPLACE= yes
-USE_GMAKE= yes
MAN1= growisofs.1
BIN_FILES= growisofs dvd+rw-format dvd+rw-booktype dvd+rw-mediainfo dvd-ram-control
diff -dur dvd+rw-tools.old/distinfo dvd+rw-tools/distinfo
--- dvd+rw-tools.old/distinfo Wed May 10 14:07:50 2006
+++ dvd+rw-tools/distinfo Wed May 10 14:09:27 2006
@@ -1,3 +1,2 @@
-MD5 (dvd+rw-tools-6.0.tar.gz) = 0c2b8afa027b93b84005ccd1c06fbd54
-SHA256 (dvd+rw-tools-6.0.tar.gz) = 17cdb64c5daa0ee553984a397434a8ed63a25fae5807b39613fec8df382e4729
-SIZE (dvd+rw-tools-6.0.tar.gz) = 118804
+MD5 (dvd+rw-tools-6.1.tar.gz) = d6bad594e55a2e0d7cf76ce452fce399
+SIZE (dvd+rw-tools-6.1.tar.gz) = 121425
diff -dur dvd+rw-tools.old/files/patch-growisofs.c dvd+rw-tools/files/patch-growisofs.c
--- dvd+rw-tools.old/files/patch-growisofs.c Wed May 10 14:07:50 2006
+++ dvd+rw-tools/files/patch-growisofs.c Wed May 10 14:10:45 2006
@@ -1,12 +1,85 @@
---- growisofs.c_old Mon Jan 16 06:09:41 2006
-+++ growisofs.c Mon Jan 16 12:02:04 2006
-@@ -2194,7 +2194,9 @@
- nice(-20);
- /* I'd rather do it right after I allocate ring buffer and fire off
- * threads, but I'll be running without extra privileges by then:-( */
-+#if !defined(__FreeBSD__) || __FreeBSD__ >= 5
- mlockall(MCL_CURRENT|MCL_FUTURE);
-+#endif
- #endif
+--- growisofs.c_old 2006-01-26 22:16:54.000000000 +0100
++++ growisofs.c 2006-02-15 00:00:44.000000000 +0100
+@@ -355,12 +355,17 @@
+ * - Treat only x73xx OPC errors as fatal;
+ * - Fix typo in -speed scaling code;
+ * - permit tracksize to be not divisible by 32KB in DAO mode;
++ * 6.1.1: (by Nicolas Boichat, Bacula project)
++ * - Allow session to cross 4GB boundary regardless of medium type
++ * (don't need to have a DL media)
++ * - Add a -F option (used instead of -M or -Z), which displays next_session
++ * offset and capacity (free space = next_session - capacity).
+ */
+ #define PRINT_VERSION(cmd) do { \
+ char *s=strrchr((cmd),'/'); \
+ s ? s++ : (s=(cmd)); \
+ printf ("* %.*sgrowisofs by <appro at fy.chalmers.se>,"\
+- " version 6.1,\n",(int)(s-(cmd)),(cmd)); \
++ " version 6.1.1,\n",(int)(s-(cmd)),(cmd)); \
+ } while (0)
+
+ #define _LARGEFILE_SOURCE
+@@ -2329,6 +2334,18 @@
+ else in_device = argv[++i];
+ dev_found = 'Z';
+ }
++ else if (argv[i][1] == 'F')
++ { if (len > 2) in_device = argv[i]+2;
++ else in_device = argv[++i];
++ dev_found = 'F';
++ dry_run = 1; /* NEVER write anything with -F */
++ }
++ else if (!strncmp(opt,"-free-space",11))
++ { if (len > 11) in_device = opt+11;
++ else in_device = argv[++i];
++ dev_found = 'F';
++ dry_run = 1; /* NEVER write anything with -F */
++ }
+ else if (!strcmp(opt,"-poor-man"))
+ { if (poor_man<0) poor_man = 1;
+ continue;
+@@ -2542,7 +2559,9 @@
+ fprintf (stderr," you most likely want to use -Z option.\n"),
+ exit (FATAL_START(errno));
- mkisofs_argv = malloc ((argc+3)*sizeof(char *));
+- if (dev_found == 'M')
++ if ((dev_found == 'M') ||
++ ((dev_found == 'F') && !(mmc_profile&0x10000)) && (saved_descriptors[0].type[0] || saved_descriptors[0].type[1] || saved_descriptors[0].type[2]))
++ /* -F : The medium is not blank, there is a fs on it (the_buffer[0,1 or 2] != 0), so compute next_session. */
+ { if (memcmp (saved_descriptors[0].type,"\1CD001",6))
+ fprintf (stderr,":-( %s doesn't look like isofs...\n",
+ in_device), exit(FATAL_START(EMEDIUMTYPE));
+@@ -2565,7 +2584,7 @@
+ exit(FATAL_START(EINVAL));
+ }
+ else if (next_session > (0x200000-0x5000)) /* 4GB/2K-40MB/2K */
+- if ((mmc_profile&0xFFFF)!=0x2B || !no_4gb_check)
++ if (!no_4gb_check)
+ fprintf (stderr,":-( next session would cross 4GB "
+ "boundary, aborting...\n"),
+ exit (FATAL_START(ENOSPC));
+@@ -2608,7 +2627,7 @@
+ exit (FATAL_START(EINVAL));
+
+ if (imgfd<0)
+- { if (mkisofs_argc==1)
++ { if ((mkisofs_argc==1) && (dev_found != 'F'))
+ fprintf (stderr,"%s: no mkisofs options specified, "
+ "aborting...\n",argv[0]),
+ exit (FATAL_START(EINVAL));
+@@ -2880,6 +2899,15 @@
+ }
+ }
+
++ if (dev_found == 'F') {
++ off64_t capacity = 0;
++ printf("next_session=%lld\n", next_session*CD_BLOCK);
++ if (ioctl_handle!=INVALID_HANDLE)
++ capacity = get_capacity (ioctl_handle);
++ printf("capacity=%lld\n", capacity);
++ exit(0);
++ }
++
+ if (imgfd>=0)
+ { quiet--;
+ if (builtin_dd (imgfd,out_fd,next_session*CD_BLOCK) < 0)
Only in dvd+rw-tools.old/files: patch-mp.h
>Release-Note:
>Audit-Trail:
>Unformatted:
More information about the freebsd-ports-bugs
mailing list