Hello!
1. growisofs doesn't really seem to need groff.
2. I've made a patch for growisofs to use stock mkhybrid. A patch to
documentation tells how to revert this behaviour without recompilation.
3. The changes of 2. need modified mkhybrid (when growisofs is called with
"-version" argument, it calls mkhybrid with "-version" argument too). The
corresponding patch is fairly trivial.
Any comments?
--
Dmitrij D. Czarkoff
diff -ruN /usr/ports/sysutils/dvd+rw-tools/Makefile dvd+rw-tools/Makefile
--- /usr/ports/sysutils/dvd+rw-tools/Makefile Wed Aug 17 15:50:16 2011
+++ dvd+rw-tools/Makefile Wed Aug 17 15:53:10 2011
@@ -3,7 +3,7 @@
COMMENT= mastering tools for DVD+RW/+R/-R/-RW
DISTNAME= dvd+rw-tools-7.0
-REVISION = 0
+REVISION = 1
CATEGORIES= sysutils
HOMEPAGE= http://fy.chalmers.se/~appro/linux/DVD+RW/
@@ -15,7 +15,6 @@
MASTER_SITES= ${HOMEPAGE}tools/
-RUN_DEPENDS= sysutils/cdrtools>=1.10
WANTLIB= c m pthread stdc++
# allow growisofs to work under sudo(8)
@@ -24,7 +23,6 @@
MAKE_FLAGS+= CFLAGS="${CFLAGS}" \
CXXFLAGS="${CXXFLAGS} -fno-exceptions"
-USE_GROFF = Yes
NO_REGRESS= Yes
do-install:
diff -ruN /usr/ports/sysutils/dvd+rw-tools/patches/patch-growisofs_1
dvd+rw-tools/patches/patch-growisofs_1
--- /usr/ports/sysutils/dvd+rw-tools/patches/patch-growisofs_1 Thu Jan 1
01:00:00 1970
+++ dvd+rw-tools/patches/patch-growisofs_1 Wed Aug 17 14:29:11 2011
@@ -0,0 +1,14 @@
+$OpenBSD$
+--- growisofs.1.orig Wed Aug 17 02:34:10 2011
++++ growisofs.1 Wed Aug 17 02:40:10 2011
+@@ -23,6 +23,10 @@ such as DVD+R and DVD\-R/\-RW, as well as Blu-ray Disc
+ \fIarbitrary pre-mastered image\fP (formatted as UDF, ISO9660 or any
+ other file system, if formatted at all) to all supported DVD media
+ types.
++.P
++On OpenBSD \fBgrowisofs\fP uses \fBmkhybrid\fP instead of \fBmkisofs\fP
++by default. This behaviour could be overriden by setting MKISOFS
++environment variable.
+
+ .SH OPTIONS
+ .TP
diff -ruN /usr/ports/sysutils/dvd+rw-tools/patches/patch-growisofs_c
dvd+rw-tools/patches/patch-growisofs_c
--- /usr/ports/sysutils/dvd+rw-tools/patches/patch-growisofs_c Wed Aug 17
15:49:37 2011
+++ dvd+rw-tools/patches/patch-growisofs_c Wed Aug 17 14:29:11 2011
@@ -1,6 +1,6 @@
$OpenBSD: patch-growisofs_c,v 1.3 2008/01/26 02:21:28 jakemsr Exp $
---- growisofs.c.orig Thu Jan 17 22:18:18 2008
-+++ growisofs.c Thu Jan 17 22:18:18 2008
+--- growisofs.c.orig Sun Sep 24 19:28:53 2006
++++ growisofs.c Wed Aug 17 02:33:51 2011
@@ -2296,7 +2296,7 @@ int builtin_dd (int infd,int outfd,off64_t outoff)
fcntl (in_fd,F_SETFD,rval&~FD_CLOEXEC);
@@ -10,7 +10,19 @@
exit (FATAL_START(errno));
}
while (1)
-@@ -2908,7 +2908,7 @@ int main (int argc, char *argv[])
+@@ -2723,7 +2723,11 @@ int main (int argc, char *argv[])
+
+ #if defined(__unix) || defined(__unix__)
+ env = getenv ("MKISOFS");
++#if defined(__OpenBSD__)
++ mkisofs_argv[0] = (env?env:"mkhybrid");
++#else
+ mkisofs_argv[0] = (env?env:"mkisofs");
++#endif
+ #elif defined(_WIN32)
+ /*
+ * On Windows I insist on mkisofs.exe to reside in very same
+@@ -2908,7 +2912,7 @@ int main (int argc, char *argv[])
fflush (stdout);
#if defined(__unix) || defined(__unix__)
setuid(getuid());
--- mkisofs.c.orig Wed Aug 17 03:10:54 2011
+++ mkisofs.c Wed Aug 17 03:27:49 2011
@@ -250,6 +250,7 @@
#define OPTION_X_LIST 244
#define OPTION_HFS_BLESS 245
+#define OPTION_PVERSION 246
#endif /* APPLE_HYB */
static const struct ld_option ld_options[] =
@@ -342,6 +343,8 @@
'T', NULL, "Generate translation tables for systems that don't
understand long filenames", ONE_DASH },
{ {"verbose", no_argument, NULL, 'v'},
'v', NULL, "Verbose", ONE_DASH },
+ { {"version", no_argument, NULL, OPTION_PVERSION},
+ '\0', NULL, "Print the current version", ONE_DASH},
{ {"volid", required_argument, NULL, 'V'},
'V', "ID", "Set Volume ID" , ONE_DASH },
{ {"volset", required_argument, NULL, OPTION_VOLSET},
@@ -1026,6 +1029,10 @@
case OPTION_HELP:
usage ();
exit (0);
+ break;
+ case OPTION_PVERSION:
+ printf("%s\n", version_string);
+ exit(0);
break;
case OPTION_NOSPLIT_SL_COMPONENT:
split_SL_component = 0;
--- mkhybrid.8tbl.orig Wed Aug 17 14:18:21 2011
+++ mkhybrid.8tbl Wed Aug 17 14:21:37 2011
@@ -118,6 +118,9 @@
.B \-v
]
[
+.B \-version
+]
+[
.B \-V
.I volid
]
@@ -741,6 +744,9 @@
.TP
.B \-v
Verbose execution. If given twice on the command line, extra debug information
will be printed.
+.TP
+.B \-version
+Show version info and exit.
.TP
.BI \-x " path
Exclude
$ sudo growisofs -version
* growisofs by <ap...@fy.chalmers.se>, version 7.0,
front-ending to mkhybrid: mkhybrid 1.12b5.1
$ sudo growisofs -Z /dev/rcd0c -speed=4 -flRJ big_guck_bunny.avi
WARNING: /dev/rcd0c already carries isofs!
About to execute 'mkhybrid -flRJ big_guck_bunny.avi | builtin_dd of=/dev/rcd0c
obs=32k seek=0'
1.10% done, estimate finish Wed Aug 17 15:35:32 2011
2.21% done, estimate finish Wed Aug 17 15:35:32 2011
3.31% done, estimate finish Wed Aug 17 15:35:32 2011
/dev/rcd0c: "Current Write Speed" is 4.1x1352KBps.
4.41% done, estimate finish Wed Aug 17 15:41:57 2011
5.51% done, estimate finish Wed Aug 17 15:41:17 2011
6.62% done, estimate finish Wed Aug 17 15:40:49 2011
<...>
97.03% done, estimate finish Wed Aug 17 15:38:36 2011
98.13% done, estimate finish Wed Aug 17 15:38:37 2011
99.24% done, estimate finish Wed Aug 17 15:38:37 2011
Total translation table size: 0
Total rockridge attributes bytes: 259
Total directory bytes: 0
Path table size(bytes): 10
Max brk space used 0
453483 extents written (885 Mb)
builtin_dd: 453488*2KB out @ average 2.5x1352KBps
/dev/rcd0c: flushing cache
/dev/rcd0c: stopping de-icing
/dev/rcd0c: writing lead-out
/dev/rcd0c: reloading tray
