aboutsummaryrefslogtreecommitdiff
path: root/sysutils/nautilus-cd-burner
diff options
context:
space:
mode:
Diffstat (limited to 'sysutils/nautilus-cd-burner')
-rw-r--r--sysutils/nautilus-cd-burner/Makefile26
-rw-r--r--sysutils/nautilus-cd-burner/distinfo4
-rw-r--r--sysutils/nautilus-cd-burner/files/patch-cd-drive.c221
-rw-r--r--sysutils/nautilus-cd-burner/files/patch-cd-record.c16
-rw-r--r--sysutils/nautilus-cd-burner/files/patch-configure10
-rw-r--r--sysutils/nautilus-cd-burner/files/patch-make-iso.c26
-rw-r--r--sysutils/nautilus-cd-burner/pkg-descr8
-rw-r--r--sysutils/nautilus-cd-burner/pkg-plist21
8 files changed, 56 insertions, 276 deletions
diff --git a/sysutils/nautilus-cd-burner/Makefile b/sysutils/nautilus-cd-burner/Makefile
index f2f68f798864..715870d6a315 100644
--- a/sysutils/nautilus-cd-burner/Makefile
+++ b/sysutils/nautilus-cd-burner/Makefile
@@ -6,11 +6,10 @@
#
PORTNAME= nautilus-cd-burner
-PORTVERSION= 0.5.3
-PORTREVISION= 7
+PORTVERSION= 2.6.0
CATEGORIES= sysutils gnome
MASTER_SITES= ${MASTER_SITE_GNOME}
-MASTER_SITE_SUBDIR= sources/${PORTNAME}/0.5
+MASTER_SITE_SUBDIR= sources/${PORTNAME}/2.6
DIST_SUBDIR= gnome2
MAINTAINER= gnome@FreeBSD.org
@@ -21,14 +20,31 @@ RUN_DEPENDS= mkisofs:${PORTSDIR}/sysutils/mkisofs \
USE_BZIP2= yes
USE_X_PREFIX= yes
+USE_REINPLACE= yes
USE_GMAKE= yes
GNOME_DESKTOP_VERSION=2
-USE_GNOME= gnomeprefix gnomehack nautilus2
+USE_GNOME= gnomeprefix gnomehack intlhack lthack nautilus2
USE_LIBTOOL_VER=13
CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \
LDFLAGS="-L${LOCALBASE}/lib"
+.include <bsd.port.pre.mk>
+
+.if exists(${LOCALBASE}/bin/growisofs)
+WITH_DVD= yes
+.endif
+
+.if defined(WITH_DVD)
+RUN_DEPENDS+= growisofs:${PORTSDIR}/sysutils/dvd+rw-tools
+.endif
+
+pre-everything::
+ @${ECHO_MSG} ""
+ @${ECHO_MSG} "${PORTNAME} has the following configurable option(s):"
+ @${ECHO_MSG} " WITH_DVD Enable DVD burning support"
+ @${ECHO_MSG} ""
+
post-install:
@${CAT} ${PKGMESSAGE}
-.include <bsd.port.mk>
+.include <bsd.port.post.mk>
diff --git a/sysutils/nautilus-cd-burner/distinfo b/sysutils/nautilus-cd-burner/distinfo
index 90ebf051db16..7f3b60ce0435 100644
--- a/sysutils/nautilus-cd-burner/distinfo
+++ b/sysutils/nautilus-cd-burner/distinfo
@@ -1,2 +1,2 @@
-MD5 (gnome2/nautilus-cd-burner-0.5.3.tar.bz2) = ba461f080a3ca63936c0c7cab46dd8d8
-SIZE (gnome2/nautilus-cd-burner-0.5.3.tar.bz2) = 311289
+MD5 (gnome2/nautilus-cd-burner-2.6.0.tar.bz2) = 3e1dbaa4b4a9c512cec8d7b5a5d86bf0
+SIZE (gnome2/nautilus-cd-burner-2.6.0.tar.bz2) = 448199
diff --git a/sysutils/nautilus-cd-burner/files/patch-cd-drive.c b/sysutils/nautilus-cd-burner/files/patch-cd-drive.c
deleted file mode 100644
index aea6a2e1289f..000000000000
--- a/sysutils/nautilus-cd-burner/files/patch-cd-drive.c
+++ /dev/null
@@ -1,221 +0,0 @@
---- cd-drive.c.orig Mon Sep 8 15:24:07 2003
-+++ cd-drive.c Tue Dec 30 12:46:59 2003
-@@ -693,28 +693,133 @@
- #endif /* __linux__ */
-
- #ifdef __FreeBSD__
-+static void
-+get_cd_properties (char *id, int *max_rd_speed, int *max_wr_speed,
-+ CDDriveType *type)
-+{
-+ int i;
-+ const char *argv[20];
-+ char *dev_str, *stdout_data, *rd_speed, *wr_speed, *drive_cap;
-+
-+ *max_rd_speed = -1;
-+ *max_wr_speed = -1;
-+ *type = 0;
-+
-+ i = 0;
-+ argv[i++] = "cdrecord";
-+ argv[i++] = "-prcap";
-+ dev_str = g_strdup_printf ("dev=%s", id);
-+ argv[i++] = dev_str;
-+ argv[i++] = NULL;
-+
-+ if (g_spawn_sync (NULL,
-+ (char **)argv,
-+ NULL,
-+ G_SPAWN_SEARCH_PATH | G_SPAWN_STDERR_TO_DEV_NULL,
-+ NULL, NULL,
-+ &stdout_data,
-+ NULL,
-+ NULL,
-+ NULL)) {
-+ wr_speed = strstr (stdout_data, "Maximum write speed:");
-+ if (wr_speed != NULL) {
-+ char *tok;
-+ wr_speed += strlen ("Maximum write speed:");
-+ for (tok = strtok (wr_speed, " (),\t\n");
-+ tok && strcmp (tok, "CD");
-+ tok = strtok (NULL, " (),\t\n")) {}
-+ tok = strtok (NULL, " (),\t\n"); /* Get the CD speed. */
-+ *max_wr_speed = atol (tok);
-+ }
-+ else {
-+ wr_speed = strstr (stdout_data, "Maximum write speed in kB/s:");
-+ if (wr_speed != NULL) {
-+ char *tok;
-+ wr_speed += strlen ("Maximum write speed in kB/s:");
-+ for (tok = strtok (wr_speed, " (),\t\n");
-+ tok && strcmp (tok, "CD");
-+ tok = strtok (NULL, " (),\t\n")) {}
-+ tok = strtok (NULL, " (),\t\n"); /* Get the CD speed. */
-+ *max_wr_speed = atol (tok);
-+ }
-+ }
-+
-+ rd_speed = strstr (stdout_data, "Maximum read speed:");
-+ if (rd_speed != NULL) {
-+ char *tok;
-+ rd_speed += strlen ("Maximum read speed:");
-+ for (tok = strtok (rd_speed, " (),\t\n");
-+ tok && strcmp (tok, "CD");
-+ tok = strtok (NULL, " (),\t\n")) {}
-+ tok = strtok (NULL, " (),\t\n"); /* Get the CD speed. */
-+ *max_rd_speed = atol (tok);
-+ }
-+ else {
-+ rd_speed = strstr (stdout_data, "Maximum read speed in kB/s:");
-+ if (rd_speed != NULL) {
-+ char *tok;
-+ rd_speed += strlen ("Maximum read speed in kB/s:");
-+ for (tok = strtok (rd_speed, " (),\t\n");
-+ tok && strcmp (tok, "CD");
-+ tok = strtok (NULL, " (),\t\n")) {}
-+ tok = strtok (NULL, " (),\t\n"); /* Get the CD speed. */
-+ *max_rd_speed = atol (tok);
-+ }
-+ }
-+ drive_cap = strstr (stdout_data, "Does write DVD-RAM media");
-+ if (drive_cap != NULL) {
-+ *type |= CDDRIVE_TYPE_DVD_RAM_RECORDER;
-+ }
-+ drive_cap = strstr (stdout_data, "Does read DVD-R media");
-+ if (drive_cap != NULL) {
-+ *type |= CDDRIVE_TYPE_DVD_RW_RECORDER;
-+ }
-+ drive_cap = strstr (stdout_data, "Does read DVD-ROM media");
-+ if (drive_cap != NULL) {
-+ *type |= CDDRIVE_TYPE_DVD_DRIVE;
-+ }
-+ drive_cap = strstr (stdout_data, "Does write CD-RW media");
-+ if (drive_cap != NULL) {
-+ *type |= CDDRIVE_TYPE_CDRW_RECORDER;
-+ }
-+ drive_cap = strstr (stdout_data, "Does write CD-R media");
-+ if (drive_cap != NULL) {
-+ *type |= CDDRIVE_TYPE_CD_RECORDER;
-+ }
-+ drive_cap = strstr (stdout_data, "Does read CD-R media");
-+ if (drive_cap != NULL) {
-+ *type |= CDDRIVE_TYPE_CD_DRIVE;
-+ }
-+ g_free (stdout_data);
-+ }
-+
-+ g_free (dev_str);
-+}
-+
- static GList *
- freebsd_scan (gboolean recorder_only)
- {
- GList *cdroms_list = NULL;
- const char *dev_type = "cd";
-- int fd;
- 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;
- CDDrive *cdrom;
-- gchar *cam_path, *dev;
-+ gchar *cam_path;
- struct cam_device *cam_dev;
-
-- type = 0;
- cam_path = g_strdup_printf ("/dev/%s%dc", dev_type, i);
-
- 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) {
-@@ -723,47 +828,41 @@
- continue;
- }
-
-- /* 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);
-- } else {
-- dev = g_strdup (cam_path);
-- }
--
-- g_free (cam_path);
--
-- if ((fd = open (dev, O_RDWR, 0)) < 0) {
-- g_free (dev);
-- free (cam_dev);
-- i++;
-- continue;
-- }
--
-- type |= CDDRIVE_TYPE_CD_DRIVE;
-- if (ioctl (fd, CDRIOCWRITESPEED, &max_speed) >= 0) {
-- /* XXX is it CD-R or CD-RW ? */
-- type |= CDDRIVE_TYPE_CD_RECORDER;
-- }
--
-- close (fd);
--
-- if (type & CDDRIVE_TYPE_CD_RECORDER
-- || type & CDDRIVE_TYPE_CDRW_RECORDER
-- || recorder_only == FALSE) {
-- cdrom = g_new0 (CDDrive, 1);
-- cdrom->display_name = g_strdup_printf ("%s %s", cam_dev->inq_data.vendor, cam_dev->inq_data.revision);
-- cdrom->device = g_strdup (dev);
-- cdrom->max_speed_read = speed;
-- cdrom->max_speed_write = speed;
-- cdrom->cdrecord_id = g_strdup_printf ("%d,%d,%d", cam_dev->path_id, cam_dev->target_id, cam_dev->target_lun);
-- cdrom->type = type;
--
-- add_dvd_plus (cdrom);
-+ cdrom = g_new0 (CDDrive, 1);
-+ cdrom->display_name = g_strdup_printf ("%s %s", cam_dev->inq_data.vendor, cam_dev->inq_data.revision);
-+ cdrom->device = g_strdup (cam_path);
-+ cdrom->cdrecord_id = g_strdup_printf ("%d,%d,%d", cam_dev->path_id, cam_dev->target_id, cam_dev->target_lun);
-+ /* Attempt to get more specific information from
-+ * this drive by using cdrecord.
-+ */
-+ get_cd_properties (cdrom->cdrecord_id,
-+ &(cdrom->max_speed_read),
-+ &(cdrom->max_speed_write),
-+ &(cdrom->type));
-+ if (cdrom->type & CDDRIVE_TYPE_CD_RECORDER
-+ || cdrom->type & CDDRIVE_TYPE_CDRW_RECORDER
-+ || cdrom->type & CDDRIVE_TYPE_DVD_RAM_RECORDER
-+ || cdrom->type & CDDRIVE_TYPE_DVD_RW_RECORDER
-+ || !recorder_only) {
-+
-+ if (cdrom->max_speed_read == -1) {
-+ cdrom->max_speed_read = speed;
-+ }
-+ if (cdrom->max_speed_write == -1) {
-+ cdrom->max_speed_write = speed;
-+ }
-+
-+ if (cdrom->type & CDDRIVE_TYPE_DVD_DRIVE) {
-+ add_dvd_plus (cdrom);
-+ }
-
- cdroms_list = g_list_append (cdroms_list, cdrom);
- }
-+ else {
-+ cd_drive_free (cdrom);
-+ }
-
-- g_free (dev);
-+ g_free (cam_path);
- free (cam_dev);
-
- i++;
diff --git a/sysutils/nautilus-cd-burner/files/patch-cd-record.c b/sysutils/nautilus-cd-burner/files/patch-cd-record.c
deleted file mode 100644
index e7b501be0227..000000000000
--- a/sysutils/nautilus-cd-burner/files/patch-cd-record.c
+++ /dev/null
@@ -1,16 +0,0 @@
---- cd-recorder.c.orig Thu Oct 2 13:09:26 2003
-+++ cd-recorder.c Thu Oct 2 13:10:27 2003
-@@ -334,12 +334,9 @@
- cdrecorder->priv->music_count = build_list_of_music_arguments ("burn:///", &i, argv, 200-i-5);
- } else {
- cdrecorder->priv->music_count = 0;
-+ argv[i++] = "-dao"; /* XXX, this is a hack. */
- argv[i++] = "-data";
- argv[i++] = filename;
-- }
--
-- if (needs_dvd_writer) {
-- argv[i++] = "-dao";
- }
-
- argv[i++] = NULL;
diff --git a/sysutils/nautilus-cd-burner/files/patch-configure b/sysutils/nautilus-cd-burner/files/patch-configure
deleted file mode 100644
index ff42da02d5ad..000000000000
--- a/sysutils/nautilus-cd-burner/files/patch-configure
+++ /dev/null
@@ -1,10 +0,0 @@
---- configure.orig Wed Dec 11 15:37:55 2002
-+++ configure Wed Dec 11 15:38:17 2002
-@@ -7313,6 +7313,7 @@
-
- # This can be used to rebuild libtool when needed
- LIBTOOL_DEPS="$ac_aux_dir/ltmain.sh"
-+$ac_aux_dir/ltconfig $LIBTOOL_DEPS
-
- # Always use our own libtool.
- LIBTOOL='$(SHELL) $(top_builddir)/libtool'
diff --git a/sysutils/nautilus-cd-burner/files/patch-make-iso.c b/sysutils/nautilus-cd-burner/files/patch-make-iso.c
index 958fe4cd050f..87cd0836b813 100644
--- a/sysutils/nautilus-cd-burner/files/patch-make-iso.c
+++ b/sysutils/nautilus-cd-burner/files/patch-make-iso.c
@@ -1,18 +1,18 @@
---- make-iso.c.orig Mon Sep 8 21:24:07 2003
-+++ make-iso.c Thu Oct 2 21:06:43 2003
-@@ -545,6 +545,7 @@
- argv[i++] = "mkisofs";
+--- make-iso.c.orig Fri Dec 19 13:06:34 2003
++++ make-iso.c Mon Dec 29 16:18:15 2003
+@@ -571,6 +571,7 @@
argv[i++] = "-r";
- argv[i++] = "-J";
-+ argv[i++] = "-joliet-long";
+ if (use_joliet) {
+ argv[i++] = "-J";
++ argv[i++] = "-joliet-long";
+ }
+ argv[i++] = "-q";
argv[i++] = "-graft-points";
- argv[i++] = "-path-list";
- argv[i++] = filelist;
-@@ -598,6 +599,7 @@
- argv[i++] = "mkisofs";
+@@ -650,6 +651,7 @@
argv[i++] = "-r";
- argv[i++] = "-J";
-+ argv[i++] = "-joliet-long";
+ if (use_joliet) {
+ argv[i++] = "-J";
++ argv[i++] = "-joliet-long";
+ }
argv[i++] = "-graft-points";
argv[i++] = "-path-list";
- argv[i++] = filelist;
diff --git a/sysutils/nautilus-cd-burner/pkg-descr b/sysutils/nautilus-cd-burner/pkg-descr
index c3520e981e0f..0bdde4f1ac65 100644
--- a/sysutils/nautilus-cd-burner/pkg-descr
+++ b/sysutils/nautilus-cd-burner/pkg-descr
@@ -1,6 +1,2 @@
-nautilus-cd-burner is an extension to Nautilus that makes it easy to
-write files to a CD burner.
-
-The user uses Nautilus or another gnome-vfs aware app to copy the
-files he wants to write to burn:///, and then nautilus-cd-burner is
-launched in some way to write the files to the CD.
+Nautilus-cd-burner allows CDs to be created and burned directly from
+within Nautilus (using the burn:/// URI).
diff --git a/sysutils/nautilus-cd-burner/pkg-plist b/sysutils/nautilus-cd-burner/pkg-plist
index 0e601abc70ac..e3ba00c5161d 100644
--- a/sysutils/nautilus-cd-burner/pkg-plist
+++ b/sysutils/nautilus-cd-burner/pkg-plist
@@ -1,9 +1,13 @@
bin/nautilus-cd-burner
+etc/gconf/gconf.xml.defaults/apps/nautilus-cd-burner/%gconf.xml
+etc/gconf/gconf.xml.defaults/schemas/apps/nautilus-cd-burner/%gconf.xml
+etc/gconf/schemas/ncb.schemas
etc/gnome-vfs-2.0/modules/mapping-modules.conf
lib/gnome-vfs-2.0/modules/libmapping.so
-libdata/bonobo/servers/Nautilus_CD_Burner_Context_Menu.server
+lib/nautilus/extensions-1.0/libnautilus-burn.a
+lib/nautilus/extensions-1.0/libnautilus-burn.so
+lib/nautilus/extensions-1.0/libnautilus-burn.so.0
libexec/mapping-daemon
-libexec/nautilus-cd-burner-context-menu
share/gnome/nautilus-cd-burner/cdburn.glade
share/gnome/nautilus-cd-burner/cdspin1.png
share/gnome/nautilus-cd-burner/cdspin2.png
@@ -14,6 +18,7 @@ share/gnome/nautilus-cd-burner/cdspin6.png
share/gnome/nautilus-cd-burner/cdspin7.png
share/gnome/nautilus-cd-burner/cdspin8.png
share/locale/am/LC_MESSAGES/nautilus-cd-burner.mo
+share/locale/ar/LC_MESSAGES/nautilus-cd-burner.mo
share/locale/az/LC_MESSAGES/nautilus-cd-burner.mo
share/locale/be/LC_MESSAGES/nautilus-cd-burner.mo
share/locale/bg/LC_MESSAGES/nautilus-cd-burner.mo
@@ -24,25 +29,33 @@ share/locale/cy/LC_MESSAGES/nautilus-cd-burner.mo
share/locale/da/LC_MESSAGES/nautilus-cd-burner.mo
share/locale/de/LC_MESSAGES/nautilus-cd-burner.mo
share/locale/el/LC_MESSAGES/nautilus-cd-burner.mo
+share/locale/en_GB/LC_MESSAGES/nautilus-cd-burner.mo
share/locale/es/LC_MESSAGES/nautilus-cd-burner.mo
share/locale/et/LC_MESSAGES/nautilus-cd-burner.mo
+share/locale/eu/LC_MESSAGES/nautilus-cd-burner.mo
+share/locale/fa/LC_MESSAGES/nautilus-cd-burner.mo
share/locale/fi/LC_MESSAGES/nautilus-cd-burner.mo
share/locale/fr/LC_MESSAGES/nautilus-cd-burner.mo
share/locale/ga/LC_MESSAGES/nautilus-cd-burner.mo
share/locale/he/LC_MESSAGES/nautilus-cd-burner.mo
share/locale/hi/LC_MESSAGES/nautilus-cd-burner.mo
+share/locale/hr/LC_MESSAGES/nautilus-cd-burner.mo
share/locale/hu/LC_MESSAGES/nautilus-cd-burner.mo
+share/locale/id/LC_MESSAGES/nautilus-cd-burner.mo
share/locale/it/LC_MESSAGES/nautilus-cd-burner.mo
share/locale/ja/LC_MESSAGES/nautilus-cd-burner.mo
share/locale/ko/LC_MESSAGES/nautilus-cd-burner.mo
+share/locale/lt/LC_MESSAGES/nautilus-cd-burner.mo
share/locale/lv/LC_MESSAGES/nautilus-cd-burner.mo
-share/locale/mk/LC_MESSAGES/nautilus-cd-burner.mo
+share/locale/mn/LC_MESSAGES/nautilus-cd-burner.mo
share/locale/ms/LC_MESSAGES/nautilus-cd-burner.mo
share/locale/nl/LC_MESSAGES/nautilus-cd-burner.mo
share/locale/no/LC_MESSAGES/nautilus-cd-burner.mo
+share/locale/pa/LC_MESSAGES/nautilus-cd-burner.mo
share/locale/pl/LC_MESSAGES/nautilus-cd-burner.mo
share/locale/pt/LC_MESSAGES/nautilus-cd-burner.mo
share/locale/pt_BR/LC_MESSAGES/nautilus-cd-burner.mo
+share/locale/ro/LC_MESSAGES/nautilus-cd-burner.mo
share/locale/ru/LC_MESSAGES/nautilus-cd-burner.mo
share/locale/sk/LC_MESSAGES/nautilus-cd-burner.mo
share/locale/sl/LC_MESSAGES/nautilus-cd-burner.mo
@@ -57,3 +70,5 @@ share/locale/vi/LC_MESSAGES/nautilus-cd-burner.mo
share/locale/zh_CN/LC_MESSAGES/nautilus-cd-burner.mo
share/locale/zh_TW/LC_MESSAGES/nautilus-cd-burner.mo
@dirrm share/gnome/nautilus-cd-burner
+@dirrm etc/gconf/gconf.xml.defaults/schemas/apps/nautilus-cd-burner
+@dirrm etc/gconf/gconf.xml.defaults/apps/nautilus-cd-burner