diff options
| author | Adam Weinberger <adamw@FreeBSD.org> | 2003-09-25 05:37:59 +0000 |
|---|---|---|
| committer | Adam Weinberger <adamw@FreeBSD.org> | 2003-09-25 05:37:59 +0000 |
| commit | b94f2f30862b3190689d0711befcd312bddaca63 (patch) | |
| tree | c865f862cbc37a12eb1aad9404ad63e9a51d54f0 /sysutils/nautilus-cd-burner | |
| parent | Add battfink. (diff) | |
Fix on -CURRENT where 'c' node entries for CD devices don't exist.
Bump PORTREVISION.
Obtained from: marcus
Diffstat (limited to 'sysutils/nautilus-cd-burner')
| -rw-r--r-- | sysutils/nautilus-cd-burner/Makefile | 1 | ||||
| -rw-r--r-- | sysutils/nautilus-cd-burner/files/patch-cd-drive.c | 37 |
2 files changed, 38 insertions, 0 deletions
diff --git a/sysutils/nautilus-cd-burner/Makefile b/sysutils/nautilus-cd-burner/Makefile index e617d3492774..f073bb075ebf 100644 --- a/sysutils/nautilus-cd-burner/Makefile +++ b/sysutils/nautilus-cd-burner/Makefile @@ -7,6 +7,7 @@ PORTNAME= nautilus-cd-burner PORTVERSION= 0.5.3 +PORTREVISION= 1 CATEGORIES= sysutils gnome MASTER_SITES= ${MASTER_SITE_GNOME} MASTER_SITE_SUBDIR= sources/${PORTNAME}/0.5 diff --git a/sysutils/nautilus-cd-burner/files/patch-cd-drive.c b/sysutils/nautilus-cd-burner/files/patch-cd-drive.c new file mode 100644 index 000000000000..138791648f5f --- /dev/null +++ b/sysutils/nautilus-cd-burner/files/patch-cd-drive.c @@ -0,0 +1,37 @@ +--- cd-drive.c.orig Sat Sep 20 00:07:14 2003 ++++ cd-drive.c Sat Sep 20 00:14:56 2003 +@@ -702,6 +702,7 @@ + int speed = 16; /* XXX Hardcode the write speed for now. */ + int max_speed = CDR_MAX_SPEED; + int i = 0; ++ int cnode = 1; /* Use the CD device's 'c' node. */ + + while (1) { + CDDriveType type; +@@ -714,7 +715,12 @@ + + if (!g_file_test (cam_path, G_FILE_TEST_EXISTS)) { + g_free (cam_path); +- break; ++ cam_path = g_strdup_printf ("/dev/%s%d", dev_type, i); ++ cnode = 0; ++ if (!g_file_test (cam_path, G_FILE_TEST_EXISTS)) { ++ g_free (cam_path); ++ break; ++ } + } + + if ((cam_dev = cam_open_spec_device (dev_type, i, O_RDWR, NULL)) == NULL) { +@@ -725,7 +731,11 @@ + + /* XXX Other controllers might need to be added. */ + if ((strncmp (cam_dev->sim_name, "ata", 3)) == 0) { +- dev = g_strdup_printf ("/dev/a%s%dc", dev_type, i); ++ if (cnode) { ++ dev = g_strdup_printf ("/dev/a%s%dc", dev_type, i); ++ } else { ++ dev = g_strdup_printf ("/dev/a%s%d", dev_type, i); ++ } + } else { + dev = g_strdup (cam_path); + } |