957d478a92
2.01_2 with the "official" version from cdrtools 2.01.01a06. - Patch i386-freebsd-cc.rul to allow compilation with CC set to a compiler other than the default (as long as it doesn't include a path component, which requires considerably changes to make work). - Make the direct ATAPI transport of cdda2wav work again with FreeBSD after device major numbers were abandoned; bump PORTREVISION for this. Approved by: netchild
19 lines
562 B
C
19 lines
562 B
C
--- cdda2wav/interface.c Mon Dec 29 11:28:09 2003
|
|
+++ cdda2wav/interface.c Sun Jan 18 01:35:50 2004
|
|
@@ -445,7 +445,15 @@
|
|
default: /* for example ATAPI cds */
|
|
#else
|
|
#if defined (__FreeBSD__)
|
|
- case 117:
|
|
+#if __FreeBSD_version >= 600021
|
|
+ case 0: /* majors abandoned */
|
|
+ /* FALLTHROUGH */
|
|
+#endif
|
|
+#if __FreeBSD_version >= 501113
|
|
+ case 4: /* GEOM */
|
|
+ /* FALLTHROUGH */
|
|
+#endif
|
|
+ case 117: /* pre-GEOM atapi cd */
|
|
if (!S_ISCHR(statstruct->st_mode)) {
|
|
fprintf(stderr, "%s is not a char device\n",pdev_name);
|
|
exit(SYNTAX_ERROR);
|