Update to 2.8.0. This version corresponds to GNOME 2.8.0.

2.8.0:

Fix a small HIG mistake

2.7.6:

Fix getting size of DVD-R and DVD-RW

2.7.5:

Add API to get the media size (and minutes/seconds equivalent) to our library
Respect the HIG for all the error dialogs
Implement burning with "Burnproof" mode, for newer cdrecord versions
Fix translations of the "Write to Disc" menu in nautilus

2.7.4:

Overburn support in GConf
Easier to use user interface, including removal of the "Erase CD" checkbox
Simplify the HAL specific code
Remove the eel dependency in nautilus-cd-burner itself
Fix a crash when selecting the File Image target
Fix the "dummy" option appearing when not in debug mode
Some memory leak fixes

2.7.3:

Remove the libstdc++ dependency on FreeBSD 5.x
Fix the HAL requirements
Fix possible crashes in BaconCdSelection

2.7.2:

Make translations work again

2.7.1:

Basic discovery, via cdrecord, on unsupported platforms
Add mnemonics to the main window
Make debug run-time configurable
Integration of the BaconCdSelection widget, and the cd_drive_scan utility
Fix a possible conflict with udev on Linux 2.6 kernels

6 files changed, 97 insertions, 18 deletions

diff --git a/sysutils/nautilus-cd-burner/Makefile b/sysutils/nautilus-cd-burner/Makefile
index 1d6ac0be0e1..a32c5c03559 100644
--- a/sysutils/nautilus-cd-burner/Makefile
+++ b/sysutils/nautilus-cd-burner/Makefile
@@ -1,9 +1,9 @@
-# $NetBSD: Makefile,v 1.4 2004/05/15 16:52:13 jmmv Exp $
+# $NetBSD: Makefile,v 1.5 2004/09/21 17:15:35 jmmv Exp $
 #
 
-DISTNAME=	nautilus-cd-burner-2.6.1
+DISTNAME=	nautilus-cd-burner-2.8.0
 CATEGORIES=	sysutils gnome
-MASTER_SITES=	${MASTER_SITE_GNOME:=sources/nautilus-cd-burner/2.6/}
+MASTER_SITES=	${MASTER_SITE_GNOME:=sources/nautilus-cd-burner/2.8/}
 EXTRACT_SUFX=	.tar.bz2
 
 MAINTAINER=	tech-pkg@NetBSD.org
@@ -22,6 +22,8 @@ USE_LIBTOOL=		yes
 USE_X11=		yes
 GNU_CONFIGURE=		yes
 
+PKGCONFIG_OVERRIDE=	libnautilus-burn.pc.in
+
 CONFIGURE_ARGS+=	--sysconfdir=${PKG_SYSCONFDIR}
 
 PKG_SYSCONFSUBDIR=	gnome-vfs-2.0/modules
diff --git a/sysutils/nautilus-cd-burner/PLIST b/sysutils/nautilus-cd-burner/PLIST
index a8040a084ab..363abf731ae 100644
--- a/sysutils/nautilus-cd-burner/PLIST
+++ b/sysutils/nautilus-cd-burner/PLIST
@@ -1,13 +1,22 @@
-@comment $NetBSD: PLIST,v 1.2 2004/05/15 16:52:13 jmmv Exp $
+@comment $NetBSD: PLIST,v 1.3 2004/09/21 17:15:35 jmmv Exp $
 bin/nautilus-cd-burner
+include/libnautilus-burn/bacon-cd-selection.h
+include/libnautilus-burn/cd-drive.h
+include/libnautilus-burn/cd-recorder.h
 lib/gnome-vfs-2.0/modules/libmapping.a
 lib/gnome-vfs-2.0/modules/libmapping.la
 lib/gnome-vfs-2.0/modules/libmapping.so
-lib/nautilus/extensions-1.0/libnautilus-burn.a
-lib/nautilus/extensions-1.0/libnautilus-burn.la
-lib/nautilus/extensions-1.0/libnautilus-burn.so
-lib/nautilus/extensions-1.0/libnautilus-burn.so.0
-lib/nautilus/extensions-1.0/libnautilus-burn.so.0.0
+lib/libnautilus-burn.a
+lib/libnautilus-burn.la
+lib/libnautilus-burn.so
+lib/libnautilus-burn.so.0
+lib/libnautilus-burn.so.0.0
+lib/nautilus/extensions-1.0/libnautilus-burn-extension.a
+lib/nautilus/extensions-1.0/libnautilus-burn-extension.la
+lib/nautilus/extensions-1.0/libnautilus-burn-extension.so
+lib/nautilus/extensions-1.0/libnautilus-burn-extension.so.0
+lib/nautilus/extensions-1.0/libnautilus-burn-extension.so.0.0
+lib/pkgconfig/libnautilus-burn.pc
 libexec/mapping-daemon
 share/examples/nautilus-cd-burner/gnome-vfs-2.0/modules/mapping-modules.conf
 share/gconf/schemas/ncb.schemas
@@ -17,6 +26,7 @@ ${PKGLOCALEDIR}/locale/az/LC_MESSAGES/nautilus-cd-burner.mo
 ${PKGLOCALEDIR}/locale/be/LC_MESSAGES/nautilus-cd-burner.mo
 ${PKGLOCALEDIR}/locale/bg/LC_MESSAGES/nautilus-cd-burner.mo
 ${PKGLOCALEDIR}/locale/bn/LC_MESSAGES/nautilus-cd-burner.mo
+${PKGLOCALEDIR}/locale/bs/LC_MESSAGES/nautilus-cd-burner.mo
 ${PKGLOCALEDIR}/locale/ca/LC_MESSAGES/nautilus-cd-burner.mo
 ${PKGLOCALEDIR}/locale/cs/LC_MESSAGES/nautilus-cd-burner.mo
 ${PKGLOCALEDIR}/locale/cy/LC_MESSAGES/nautilus-cd-burner.mo
@@ -38,6 +48,7 @@ ${PKGLOCALEDIR}/locale/hi/LC_MESSAGES/nautilus-cd-burner.mo
 ${PKGLOCALEDIR}/locale/hr/LC_MESSAGES/nautilus-cd-burner.mo
 ${PKGLOCALEDIR}/locale/hu/LC_MESSAGES/nautilus-cd-burner.mo
 ${PKGLOCALEDIR}/locale/id/LC_MESSAGES/nautilus-cd-burner.mo
+${PKGLOCALEDIR}/locale/is/LC_MESSAGES/nautilus-cd-burner.mo
 ${PKGLOCALEDIR}/locale/it/LC_MESSAGES/nautilus-cd-burner.mo
 ${PKGLOCALEDIR}/locale/ja/LC_MESSAGES/nautilus-cd-burner.mo
 ${PKGLOCALEDIR}/locale/ko/LC_MESSAGES/nautilus-cd-burner.mo
@@ -45,8 +56,10 @@ ${PKGLOCALEDIR}/locale/lt/LC_MESSAGES/nautilus-cd-burner.mo
 ${PKGLOCALEDIR}/locale/lv/LC_MESSAGES/nautilus-cd-burner.mo
 ${PKGLOCALEDIR}/locale/mn/LC_MESSAGES/nautilus-cd-burner.mo
 ${PKGLOCALEDIR}/locale/ms/LC_MESSAGES/nautilus-cd-burner.mo
+${PKGLOCALEDIR}/locale/nb/LC_MESSAGES/nautilus-cd-burner.mo
 ${PKGLOCALEDIR}/locale/nl/LC_MESSAGES/nautilus-cd-burner.mo
 ${PKGLOCALEDIR}/locale/no/LC_MESSAGES/nautilus-cd-burner.mo
+${PKGLOCALEDIR}/locale/or/LC_MESSAGES/nautilus-cd-burner.mo
 ${PKGLOCALEDIR}/locale/pa/LC_MESSAGES/nautilus-cd-burner.mo
 ${PKGLOCALEDIR}/locale/pl/LC_MESSAGES/nautilus-cd-burner.mo
 ${PKGLOCALEDIR}/locale/pt/LC_MESSAGES/nautilus-cd-burner.mo
@@ -82,3 +95,4 @@ share/nautilus-cd-burner/cdspin8.png
 @comment in nautilus: @dirrm lib/nautilus/extensions-1.0
 @comment in nautilus: @dirrm lib/nautilus
 @comment in gnome-vfs2: @dirrm lib/gnome-vfs-2.0/modules
+@dirrm include/libnautilus-burn
diff --git a/sysutils/nautilus-cd-burner/distinfo b/sysutils/nautilus-cd-burner/distinfo
index 43fe5dc0548..6044cebc62c 100644
--- a/sysutils/nautilus-cd-burner/distinfo
+++ b/sysutils/nautilus-cd-burner/distinfo
@@ -1,5 +1,7 @@
-$NetBSD: distinfo,v 1.2 2004/05/15 16:52:13 jmmv Exp $
+$NetBSD: distinfo,v 1.3 2004/09/21 17:15:35 jmmv Exp $
 
-SHA1 (nautilus-cd-burner-2.6.1.tar.bz2) = 8004bef6696c46eac59e8a59cd73a2b5027c5d49
-Size (nautilus-cd-burner-2.6.1.tar.bz2) = 455965 bytes
-SHA1 (patch-aa) = 4f1ef8bbd859b3eb9b71c04aadf9573425fad8ae
+SHA1 (nautilus-cd-burner-2.8.0.tar.bz2) = 2dd44ac9cf65065cbdfae206d1f47ec82d2bb74c
+Size (nautilus-cd-burner-2.8.0.tar.bz2) = 512205 bytes
+SHA1 (patch-aa) = 2d6d5349725cd9fc079e5f46e5c89cccc05fc7da
+SHA1 (patch-ab) = df9449617dcb2d759af503d054d29bee9f1234b4
+SHA1 (patch-ac) = b4eb3f033e23e0f2764bcd01c2bf0185593e587a
diff --git a/sysutils/nautilus-cd-burner/patches/patch-aa b/sysutils/nautilus-cd-burner/patches/patch-aa
index 231275883ff..a88be3d1462 100644
--- a/sysutils/nautilus-cd-burner/patches/patch-aa
+++ b/sysutils/nautilus-cd-burner/patches/patch-aa
@@ -1,9 +1,9 @@
-$NetBSD: patch-aa,v 1.1.1.1 2004/04/01 19:07:12 jmmv Exp $
+$NetBSD: patch-aa,v 1.2 2004/09/21 17:15:35 jmmv Exp $
 
---- Makefile.in.orig	2004-03-08 15:48:48.000000000 +0100
+--- Makefile.in.orig	2004-09-10 18:06:14.000000000 +0200
 +++ Makefile.in
-@@ -148,12 +148,12 @@ EXTRA_DIST =  	mapping-modules.conf 		cd
- CLEANFILES = $(desktop_in_files:.desktop.in=.desktop) 	$(schema_DATA)
+@@ -183,12 +183,12 @@ CLEANFILES = $(desktop_in_files:.desktop
+ 	     $(schema_DATA) $(CDRECMARSHALFILES)
  
  
 -modulesconfdir = $(sysconfdir)/gnome-vfs-2.0/modules
@@ -16,4 +16,4 @@ $NetBSD: patch-aa,v 1.1.1.1 2004/04/01 19:07:12 jmmv Exp $
 +schemadir = $(GCONF_SCHEMA_FILE_DIR)
  schema_DATA = $(schema_in_files:.schemas.in=.schemas)
  
- modules_LTLIBRARIES =  	libmapping.la					$(NULL)
+ modules_LTLIBRARIES = libmapping.la
diff --git a/sysutils/nautilus-cd-burner/patches/patch-ab b/sysutils/nautilus-cd-burner/patches/patch-ab
new file mode 100644
index 00000000000..7080a5d7e1a
--- /dev/null
+++ b/sysutils/nautilus-cd-burner/patches/patch-ab
@@ -0,0 +1,33 @@
+$NetBSD: patch-ab,v 1.1 2004/09/21 17:15:35 jmmv Exp $
+
+--- cd-drive.c.orig	2004-08-09 22:04:30.000000000 +0200
++++ cd-drive.c
+@@ -688,8 +688,9 @@ lookup_scsi_unit (int bus, int id, int l
+ 	}
+ 	return NULL;
+ }
++#endif
+ 
+-#if !defined(__linux)
++#if !defined(__linux__)
+ static int
+ get_device_max_read_speed (char *device)
+ {
+@@ -710,7 +711,6 @@ get_device_max_read_speed (char *device)
+ 
+ 	return max_speed;
+ }
+-#endif
+ 
+ static int
+ get_device_max_write_speed (char *device)
+@@ -732,6 +732,9 @@ get_device_max_write_speed (char *device
+ 
+ 	return max_speed;
+ }
++#endif
++
++#if defined(__linux__)
+ 
+ static char *
+ get_scsi_cd_name (int bus, int id, int lun, const char *dev,
diff --git a/sysutils/nautilus-cd-burner/patches/patch-ac b/sysutils/nautilus-cd-burner/patches/patch-ac
new file mode 100644
index 00000000000..5c3478e7b77
--- /dev/null
+++ b/sysutils/nautilus-cd-burner/patches/patch-ac
@@ -0,0 +1,28 @@
+$NetBSD: patch-ac,v 1.1 2004/09/21 17:15:35 jmmv Exp $
+
+--- transport.hxx.orig	2004-02-10 11:36:36.000000000 +0100
++++ transport.hxx
+@@ -312,7 +312,11 @@ public:
+     // mounted, so that it could as well just return 0;
+     int umount(int f=-1)
+     { struct stat    fsb,msb;
++#if defined(HAVE_STATVFS) && defined(__NetBSD__)
++      struct statvfs *mntbuf;
++#else
+       struct statfs *mntbuf;
++#endif
+       int            ret=0,mntsize,i;
+ 
+ 	if (f==-1) f=fd;
+@@ -490,7 +494,11 @@ public:
+     }
+     int umount(int f=-1)
+     { struct stat    fsb,msb;
++#if defined(HAVE_STATVFS) && defined(__NetBSD__)
++      struct statvfs *mntbuf;
++#else
+       struct statfs *mntbuf;
++#endif
+       int            ret=0,mntsize,i;
+ 
+ 	if (f==-1) f=fd;