Update to 2.24.0 (probably doesn't really work, help very welcome).

===============
Version 2.24
===============

===============
Version 2.23.90
===============

- Add ability to inhibit the SessionManager

===============
Version 2.22.1
==============

- Fixed #524467, Right-click menu of DVD writer does not have "Copy Disk" option (William Jon McCann)

Translations:
- Updated be: Alexander Nyakhaychyk
- Updated nn: Eskild Hustvedt
- Updated el: Nikos Charonitakis
- Updated ml: Ani Peter
- Updated da: Kenneth Nielsen
- Updated sk: Marcel Telka

Help Manual Translations:
None

===============
Version 2.22.0
===============

  Translators

        - Updated it: Luca Ferretti
        - Updated as: Amitakhya Phukan
        - Updated ar: Djihed Afifi <djihed@gmail.com>
        - Updated cs: Petr Kovar
        - Updated gl: Ignacio Casal Quinteiro
        - Updated es: Jorge Gonzalez  <jorgegonz@svn.gnome.org>
        - Updated bn_IN: Runa Bhattacharjee
        - Updated ru: Vasiliy Faronov
        - Updated nl: Wouter Bolsterlee
        - Updated pt: Duarte Loreto
        - Updated tr: Baris Cicek
        - Updated ne: Pawan Chitrakar
        - Updated lv: Djihed Afifi <djihed@gmail.com>
        - Updated lt: Gintautas Miliauskas
        - Updated th: Theppitak Karoonboonyanan
        - Updated en_GB: Philip Withnall
        - Updated ta: I. Felix
        - Updated fr: Claude Paroz
        - Updated zh_HK: Hong Kong
        - Updated pt_BR: Jonh Wendell
        - Updated hr: Djihed Afifi <djihed@gmail.com>
        - Updated zh_TW: Taiwan
        - Updated hu: Gabor Kelemen
        - Updated fi: Ilkka Tuohela
        - Updated da: Kenneth Nielsen
        - Updated ja: Takeshi AIHANA
        - Updated ka: Djihed Afifi <djihed@gmail.com>
        - Updated be@latin: Ihar Hrachyshka
        - Updated ko: Changwoo Ryu
        - Updated kn: Runa Bhattacharjee, kn
        - Updated mk: Arangel Angov, Djihed Afifi <djihed@gmail.com>
        - Updated de: Hendrik Brandt
        - Updated pl: Artur Flinta
        - Updated uk: Maxim Dziumanenko
        - Updated mr: Rahul Bhalerao

===============
Version 2.21.6
===============

        * Get HAL udi from GIO for disc copy function.
        * Remove some straggling gnome-vfs references.

===============
Version 2.21.5
===============

        * Inihibit power management while burning (Martin Schoen)
        * Add support for creating DVD Video (Fabio Bonelli)
        * Updated CD spin icons (Denis Washington)
        * Add nautilus_burn_drive_can_eject
        * Add x-content support (Matthias Clasen)
        * Initial port to GIO
        * Use pkg-config to determine nautilus extension dir

===============
Version 2.20.0
===============

  Translators
        * Updated el: Simos Xenitellis
        * Updated bg: Alexander Shopov
        * Updated tr: Baris Cicek
        * Updated sk: Andre Klapper
        * Updated ar: Djihed Afifi <djihed@gmail.com>
        * Updated lv: Subhransu Behera
        * Updated cs: Jakub Friedl
        * Updated ro: Mugurel Tudor
        * Updated or: Subhransu Behera

===============
Version 2.19.6
===============

  nautilus-cd-burner

        * Fixed #433730, [Patch] Run gtk-update-icon-cache in install-hook and uninstall-hook (William Jon McCann)
        * Fixed #435025, Direct copy of audio CD results in white noise CD (William Jon McCann)

  Translators

        * Updated fi: Ilkka Tuohela
        * Updated ta: I. Felix


===============
Version 2.19.1
===============

  libnautilus-burn

        * Pass environment to gnome-eject so it works with ConsoleKit

===============
Version 2.18.1
===============

  Translators

        * Updated lv: Raivis Dejus
        * Updated dz: Pema Geyleg
        * Updated sl: Matic Zgur
        * Updated eu: Inaki Larranaga Murgoitio
        * Updated gl: Ignacio Casal Quinteiro
        * Updated es: Claudio Saavedra

===============
Version 2.18.0
===============

  Translators

        * Updated ru: Nickolay V. Shmyrev
        * Updated gu: Ankit Patel
        * Updated zh_HK: Hong Kong
        * Updated sr.po, sr@Latn: Goran Raki%Gć%@
        * Updated ca: Josep Puigdemont i Casamaj
        * Updated zh_TW: Taiwan
        * Updated mk: Jovan Naumovski  <jovan@lugola.net>
        * Updated lt: Gintautas Miliauskas
        * Updated dz: Pema Geyleg
        * Updated uk: Maxim Dziumanenko
        * Updated ja: Takeshi AIHANA

===============
Version 2.17.8
===============

  Translators

        * Updated pt: Duarte Loreto
        * Updated pt_BR: Raphael Higino
        * Updated zh_CN: Abel Cheung
        * Updated vi: Nguy%Gễ%@n Th
        * Updated it: Luca Ferretti
        * Updated da: Peter Bach
        * Updated hu: Gabor Kelemen
        * Updated he: Yair Hershkovitz

===============
Version 2.17.7
===============

  nautilus-cd-burner

        * Fixed #406333, crash in Computer: attempting to eject CD (William Jon McCann)

  Translators

        * Updated be: Ihar Hrachyshka
        * Updated fr: Stéphane Raimbault
        * Updated bg: Alexander Shopov
        * Updated nl: Wouter Bolsterlee
        * Updated nb: Kjartan Maraas
        * Updated de: Hendrik Richter
        * Updated ko: Changwoo Ryu
        * Updated sv: Daniel Nylander
        * Updated ar: Changwoo Ryu
        * Updated en_GB: British
        * Updated th: Theppitak Karoonboonyanan
        * Updated et: Priit Laes
        * Updated fi: Ilkka Tuohela
        * Updated pl: Artur Flinta



===============
Version 2.17.6
===============

  nautilus-cd-burner

        * Fixed #332615, Nautilus cdburner gives wrong error on missing discspace (William Jon McCann)
        * Fixed #385382, Update description and label for menu entry in Places menu (Luca Ferretti)
        * Fixed #395079, ejects the CD after copying to image (William Jon McCann)

  Translators

        * Updated ca: Josep Puigdemont i Casamajó
        * Updated de: Hendrik Richter


===============
Version 2.17.5
===============

  nautilus-cd-burner

        * Fixed #355979, No copy disc option

  Translators

        * Updated ca: Josep Puigdemont i Casamajó
        * Updated lv: Raivis Dejus
        * Updated ar: Yair Hershkovitz, Djihed Afifi <djihed@gmail.com>
        * Updated ku: Erdal Ronahi
        * Updated fi: Ilkka Tuohela
        * Updated et: Priit Laes
        * Updated en_GB: British
        * Updated he: Yair Hershkovitz


==============
Version 2.17.4
==============

  nautilus-cd-burner

        * Fix a possible double free

  Translators

        * Djihed Afifi (ar)
        * Ihar Hrachyshka (be)
        * Francisco Javier F. Serrador (es)
        * Kjartan Maraas (nb)
        * Daniel Nylander (sv)
        * Theppitak Karoonboonyanan (th)

==============
Version 2.17.3
==============

  nautilus-cd-burner

        * Rename invalid filenames (Fabio Bonelli)
        * Support x-cdrdao-toc mime types (Sven Arvidsson)
        * Fix cancellation warning when erasing DVD
        * Fix create from ISO in burn://

  Translators

        * Yuval Tanny (he)
        * Luca Ferretti (it)
        * Taya (ka)

==============
Version 2.17.2
==============

  nautilus-cd-burner

        * Eject discs by default
        * Fix test for joliet on DVD writes
        * Don't use g_date_set_time

  Translators

        * Ivar Smolin (et)
        * Kjartan Maraas (nb)

==============
Version 2.17.1
==============

  Translators

        * Ivar Smolin (et)
        * Ignacio Casal Quinteiro (gl)


==============
Version 2.16.1
==============

  libnautilus-burn

        * Don't show every kbps speed available
        * Drop locks when re-entering main loop
        * Fixes for Solaris (Brian Cameron)

  nautilus extension

        * Remove read_watch before dispatching request
        * Don't loop under Solaris

  Translators

        * Abdulaziz Al-Arfaj (ar)
        * M%Gə%@tin %GƏ%@mirov (az)
        * Rostislav \"zbrox\" Raykov (bg)
        * Runa Bhattacharjee (bn_IN)
        * Senad Uka (bs)
        * "Last-Translator: Mindu Dorji\n" (dz)
        * Kostas Papadimas (el)
        * David Lodge (en_GB)
        * Francisco Javier F. Serrador (es)
        * Robert-Andr
        * Paul Duffy (ga)
        * Ankit Patel (gu)
        * Rajesh Ranjan (hi)
        * "Last-Translator: auto\n" (hr)
        * Imam Musthaqim (id)
        * Luca Ferretti (it)
        * Satoru SATOH (ja)
        * Taya (ka)
        * Raivis Dejus (lv)
        * Badral (mn)
        * Hasbullah Bin Pit (ms)
        * Wouter Bolsterlee (nl)
        * A S Alam (pa)
        * Evandro Fernandes Giovanini (pt_BR)
        * Duarte Loreto (pt)
        * Leonid Kanter (ru)
        * Steve Murphy (rw)
        * Daniel Nylander (sv)
        * Theppitak Karoonboonyanan (th)
        * Clytie Siddall (vi)

==============
Version 2.16.0
==============

  Translators

        * Runa Bhattacharjee (bn_IN)
        * Jordi Mallach (ca)
        * Meelad Zakaria (fa)
        * Robert-Andr
        * Gabor Kelemen (hu)
        * %GŽ%@ygimantas Beru%Gč%@ka (lt)
        * Ani Peter (ml)
        * Wouter Bolsterlee (nl)
        * Subhransu Behera (or)
        * Duarte Loreto (pt)
        * Felix (ta)
        * Theppitak Karoonboonyanan (th)
        * Emrah
        * Maxim Dziumanenko (uk)
        * Liu Songhe (zh_CN)
        * Woodman Tuen (zh_HK)
        * Woodman Tuen (zh_TW)

==============
Version 2.15.7
==============

  nautilus extension

        * Improve the communication protocol

  libnautilus-burn

        * Do ref counting of init/shutdown

  Translators

        * Mate ORY (hu)
        * Satoru SATOH (ja)
        * Badral (mn)
        & Leonid Kanter (ru)
        * Matic %GŽ%@gur (sl)
        * Clytie Siddall (vi)
        * Liu Songhe (zh_CN)

==============
Version 2.15.6
==============

  nautilus extension

        * Don't show copy disc option when drive is empty

  Translators

        * Runa Bhattacharjee (bn_IN)
        * Priit Laes (et)
        * I
        * Imam Musthaqim (id)
        * Kjartan Maraas (nb)
        * Tino Meinen (nl)

==============
Version 2.15.5
==============

  nautilus-cd-burner

        * Display drive speeds as floating point (Fabio Bonelli)
        * Install a desktop file to handle iso files (Fabio Bonelli)

  Translators

        * Hendrik Richter (de)
        * Francisco Javier F. Serrador (es)
        * Jovan Naumovski (mk)
        * Daniel Nylander (sv)

==============
Version 2.15.4
==============

  nautilus extension

        * Set sensitivity of Write to disc menu item.

  nautilus-cd-burner

        * New icons

  libnautilus-burn

        * Populate drive selection list correctly

  Translators

        * Rostislav \"zbrox\" Raykov (bg)
        * Mahay Alam Khan (bn_IN)
        * Hendrik Richter (de)
        * Kostas Papadimas (el)
        * Francisco Javier F. Serrador (es)
        * Priit Laes (et)
        * I
        * Ilkka Tuohela (fi)
        * Christophe Bliard (fr)
        * Ankit Patel (gu)
        * Rajesh Ranjan (hi)
        * Changwoo Ryu (ko)
        * Raivis Dejus (lv)
        * Thierry Randrianiriana (mg)
        * A S Alam (pa)
        * Leonid Kanter (ru)
        * Felix (ta)
        * Theppitak Karoonboonyanan (th)
        * Woodman Tuen (zh_HK)
        * Woodman Tuen (zh_TW)

==============
Version 2.15.3
==============

  nautilus-cd-burner

        * Fix some temp file leaks
        * Only allow editing label when burning from burn:// (Fabio Bonelli)
        * Only ask for the types of media on which data will fit (Fabio)

  libnautilus-burn

        * Require HAL > 0.5.7
        * Catch more growisofs errors
        * Add a NautilusBurnDriveMonitor singleton to manage drives
        * Rename drive_get_media_size to get_media_capacity (Fabio)
        * Fix NAUTILUS_BURN_DRIVE_SIZE_TO_TIME (Fabio)
        * Support adding and removing drives from selection automatically
        * Add nautilus_burn_drive_media_is_appendable to API (Philippe Rouquier)

  Translators

        * Francisco Javier F. Serrador (es)
        * Priit Laes (et)
        * I
        * Ignacio Casal Quinteiro (gl)
        * Ankit Patel (gu)
        * Kjartan Maraas (nb)
        * Leonid Kanter (ru)
        * Daniel Nylander (sv)
        * Theppitak Karoonboonyanan (th)
        * Clytie Siddall (vi)
        * Liu Songhe (zh_CN)

==============
Version 2.15.2
==============

  nautilus-cd-burner

        * Refactor code
        * Save writing device
        * Prompt for disc before creating ISO
        * Add some error checking for CUE files
        * Support writing DVDs on the fly (without ISO)
        * Display sizes using most appropriate units

  libnautilus-burn

        * Catch more cdrecord errors
        * Consolidate sub-proc handling in new class
        * Add new GRAFT_LIST recorder track type

  Translators

        * Francisco Javier F. Serrador (es)
        * Priit Laes (et)
        * Ankit Patel (gu)
        * Yuval Tanny (he)
        * Kjartan Maraas (nb)

==============
Version 2.15.1
==============

  nautilus-cd-burner

        * Support relative paths from command line
        * Report incorrectly encoded filenames (Mads Chr. Olesen)
        * Use window icon to report progress (Fabio Bonelli)

  libnautilus-burn

        * Show DVD speeds in speed selection when appropriate (Fabio Bonelli)

  Translators

        * Priit Laes (et)
        * Ilkka Tuohela (fi)
        * Ignacio Casal Quinteiro (gl)
        * Ankit Patel (gu)
        * Clytie Siddall (vi)

9 files changed, 59 insertions, 167 deletions

diff --git a/sysutils/nautilus-cd-burner/Makefile b/sysutils/nautilus-cd-burner/Makefile
index 714ff49db76..531b2f29d3c 100644
--- a/sysutils/nautilus-cd-burner/Makefile
+++ b/sysutils/nautilus-cd-burner/Makefile
@@ -1,19 +1,16 @@
-# $NetBSD: Makefile,v 1.55 2008/07/14 12:56:12 joerg Exp $
+# $NetBSD: Makefile,v 1.56 2008/12/02 19:58:53 wiz Exp $
 #
 
-DISTNAME=	nautilus-cd-burner-2.14.3
-PKGREVISION=	9
+DISTNAME=	nautilus-cd-burner-2.24.0
 CATEGORIES=	sysutils gnome
-MASTER_SITES=	${MASTER_SITE_GNOME:=sources/nautilus-cd-burner/2.14/}
+MASTER_SITES=	${MASTER_SITE_GNOME:=sources/nautilus-cd-burner/2.24/}
 EXTRACT_SUFX=	.tar.bz2
 
 MAINTAINER=	pkgsrc-users@NetBSD.org
 HOMEPAGE=	http://www.gnome.org/
 COMMENT=	CD burner view for Nautilus
 
-PKG_DESTDIR_SUPPORT=	user-destdir
-
-DEPENDS+=		{cdrtools,cdrtools-ossdvd}-[0-9]*:../../sysutils/cdrtools
+DEPENDS+=		cdrtools-[0-9]*:../../sysutils/cdrtools
 
 USE_DIRS+=		gnome2-1.5
 USE_TOOLS+=		gmake intltool msgfmt pkg-config
@@ -22,36 +19,34 @@ USE_LIBTOOL=		yes
 GNU_CONFIGURE=		yes
 USE_LANGUAGES=		c c++
 
+PKG_DESTDIR_SUPPORT=	user-destdir
+
 PKGCONFIG_OVERRIDE=	libnautilus-burn.pc.in
 
-CONFIGURE_ARGS+=	--disable-hal
 CONFIGURE_ARGS+=	--sysconfdir=${PKG_SYSCONFDIR:Q}
 INSTALL_MAKE_FLAGS+=	${MAKE_FLAGS}
-INSTALL_MAKE_FLAGS+=	modulesconfdir=${PREFIX}/share/examples/nautilus-cd-burner/gnome-vfs-2.0/modules
 INSTALL_MAKE_FLAGS+=	schemadir=${GCONF_SCHEMAS_DIR}
 
-CPPFLAGS+=		-D__unix__
-
-PKG_SYSCONFSUBDIR=	gnome-vfs-2.0/modules
-
-EGDIR=			${PREFIX}/share/examples/nautilus-cd-burner/gnome-vfs-2.0/modules
-CONF_FILES=		${EGDIR}/mapping-modules.conf \
-			${PKG_SYSCONFDIR}/mapping-modules.conf
-
-GCONF_SCHEMAS=		ncb.schemas
-
-BUILDLINK_API_DEPENDS.eel+=	eel>=2.13.3
-BUILDLINK_API_DEPENDS.nautilus+=	nautilus>=2.13.4
+GCONF_SCHEMAS=		nautilus-cd-burner.schemas
 
 .include "../../devel/GConf/schemas.mk"
 .include "../../devel/gettext-lib/buildlink3.mk"
+BUILDLINK_API_DEPENDS.eel+=	eel>=2.13.3
 .include "../../devel/eel/buildlink3.mk"
+BUILDLINK_API_DEPENDS.glib2+=	glib2>=2.15.4
 .include "../../devel/glib2/buildlink3.mk"
 .include "../../devel/libglade/buildlink3.mk"
+BUILDLINK_API_DEPENDS.libgnome+=	libgnome>=2.14.0
 .include "../../devel/libgnome/buildlink3.mk"
+BUILDLINK_API_DEPENDS.libgnomeui+=	libgnomeui>=2.14.0
 .include "../../devel/libgnomeui/buildlink3.mk"
+.include "../../graphics/hicolor-icon-theme/buildlink3.mk"
+.include "../../sysutils/dbus-glib/buildlink3.mk"
 .include "../../sysutils/desktop-file-utils/desktopdb.mk"
-.include "../../sysutils/gnome-vfs/buildlink3.mk"
+.include "../../sysutils/gnome-mount/buildlink3.mk"
+.include "../../sysutils/hal/buildlink3.mk"
+BUILDLINK_API_DEPENDS.nautilus+=	nautilus>=2.22.2
 .include "../../sysutils/nautilus/buildlink3.mk"
+BUILDLINK_API_DEPENDS.gtk2+=	gtk2+>=2.5.4
 .include "../../x11/gtk2/buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/sysutils/nautilus-cd-burner/PLIST b/sysutils/nautilus-cd-burner/PLIST
index 1f95afe011d..39db4f721d3 100644
--- a/sysutils/nautilus-cd-burner/PLIST
+++ b/sysutils/nautilus-cd-burner/PLIST
@@ -1,30 +1,38 @@
-@comment $NetBSD: PLIST,v 1.15 2007/09/25 10:54:18 hira Exp $
+@comment $NetBSD: PLIST,v 1.16 2008/12/02 19:58:53 wiz Exp $
 bin/nautilus-cd-burner
+include/libnautilus-burn/nautilus-burn-drive-monitor.h
 include/libnautilus-burn/nautilus-burn-drive-selection.h
 include/libnautilus-burn/nautilus-burn-drive.h
 include/libnautilus-burn/nautilus-burn-features.h
+include/libnautilus-burn/nautilus-burn-init.h
 include/libnautilus-burn/nautilus-burn-recorder.h
-lib/gnome-vfs-2.0/modules/libmapping.la
+include/libnautilus-burn/nautilus-burn.h
 lib/libnautilus-burn.la
-lib/nautilus/extensions-1.0/libnautilus-burn-extension.la
+lib/nautilus/extensions-2.0/libnautilus-burn-extension.la
 lib/pkgconfig/libnautilus-burn.pc
-libexec/mapping-daemon
+share/applications/nautilus-cd-burner-open-iso.desktop
 share/applications/nautilus-cd-burner.desktop
-share/examples/nautilus-cd-burner/gnome-vfs-2.0/modules/mapping-modules.conf
-share/gconf/schemas/ncb.schemas
+share/gconf/schemas/nautilus-cd-burner.schemas
+share/icons/hicolor/16x16/apps/nautilus-cd-burner.png
+share/icons/hicolor/22x22/apps/nautilus-cd-burner.png
+share/icons/hicolor/24x24/apps/nautilus-cd-burner.png
+share/icons/hicolor/scalable/apps/nautilus-cd-burner.svg
 share/locale/am/LC_MESSAGES/nautilus-cd-burner.mo
 share/locale/ar/LC_MESSAGES/nautilus-cd-burner.mo
+share/locale/as/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/be@latin/LC_MESSAGES/nautilus-cd-burner.mo
 share/locale/bg/LC_MESSAGES/nautilus-cd-burner.mo
 share/locale/bn/LC_MESSAGES/nautilus-cd-burner.mo
-share/locale/br/LC_MESSAGES/nautilus-cd-burner.mo
+share/locale/bn_IN/LC_MESSAGES/nautilus-cd-burner.mo
 share/locale/bs/LC_MESSAGES/nautilus-cd-burner.mo
 share/locale/ca/LC_MESSAGES/nautilus-cd-burner.mo
 share/locale/cs/LC_MESSAGES/nautilus-cd-burner.mo
 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/dz/LC_MESSAGES/nautilus-cd-burner.mo
 share/locale/el/LC_MESSAGES/nautilus-cd-burner.mo
 share/locale/en_CA/LC_MESSAGES/nautilus-cd-burner.mo
 share/locale/en_GB/LC_MESSAGES/nautilus-cd-burner.mo
@@ -41,23 +49,28 @@ 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/hy/LC_MESSAGES/nautilus-cd-burner.mo
 share/locale/id/LC_MESSAGES/nautilus-cd-burner.mo
 share/locale/is/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/ka/LC_MESSAGES/nautilus-cd-burner.mo
+share/locale/kn/LC_MESSAGES/nautilus-cd-burner.mo
 share/locale/ko/LC_MESSAGES/nautilus-cd-burner.mo
+share/locale/ku/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/mg/LC_MESSAGES/nautilus-cd-burner.mo
 share/locale/mk/LC_MESSAGES/nautilus-cd-burner.mo
+share/locale/ml/LC_MESSAGES/nautilus-cd-burner.mo
 share/locale/mn/LC_MESSAGES/nautilus-cd-burner.mo
+share/locale/mr/LC_MESSAGES/nautilus-cd-burner.mo
 share/locale/ms/LC_MESSAGES/nautilus-cd-burner.mo
 share/locale/nb/LC_MESSAGES/nautilus-cd-burner.mo
 share/locale/ne/LC_MESSAGES/nautilus-cd-burner.mo
 share/locale/nl/LC_MESSAGES/nautilus-cd-burner.mo
 share/locale/nn/LC_MESSAGES/nautilus-cd-burner.mo
-share/locale/no/LC_MESSAGES/nautilus-cd-burner.mo
+share/locale/oc/LC_MESSAGES/nautilus-cd-burner.mo
 share/locale/or/LC_MESSAGES/nautilus-cd-burner.mo
 share/locale/pa/LC_MESSAGES/nautilus-cd-burner.mo
 share/locale/pl/LC_MESSAGES/nautilus-cd-burner.mo
@@ -66,11 +79,12 @@ 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/rw/LC_MESSAGES/nautilus-cd-burner.mo
+share/locale/si/LC_MESSAGES/nautilus-cd-burner.mo
 share/locale/sk/LC_MESSAGES/nautilus-cd-burner.mo
 share/locale/sl/LC_MESSAGES/nautilus-cd-burner.mo
 share/locale/sq/LC_MESSAGES/nautilus-cd-burner.mo
 share/locale/sr/LC_MESSAGES/nautilus-cd-burner.mo
-share/locale/sr@Latn/LC_MESSAGES/nautilus-cd-burner.mo
+share/locale/sr@latin/LC_MESSAGES/nautilus-cd-burner.mo
 share/locale/sv/LC_MESSAGES/nautilus-cd-burner.mo
 share/locale/ta/LC_MESSAGES/nautilus-cd-burner.mo
 share/locale/te/LC_MESSAGES/nautilus-cd-burner.mo
@@ -83,7 +97,6 @@ share/locale/xh/LC_MESSAGES/nautilus-cd-burner.mo
 share/locale/zh_CN/LC_MESSAGES/nautilus-cd-burner.mo
 share/locale/zh_HK/LC_MESSAGES/nautilus-cd-burner.mo
 share/locale/zh_TW/LC_MESSAGES/nautilus-cd-burner.mo
-share/nautilus-cd-burner/cdburn.glade
 share/nautilus-cd-burner/cdspin1.png
 share/nautilus-cd-burner/cdspin2.png
 share/nautilus-cd-burner/cdspin3.png
@@ -92,12 +105,14 @@ share/nautilus-cd-burner/cdspin5.png
 share/nautilus-cd-burner/cdspin6.png
 share/nautilus-cd-burner/cdspin7.png
 share/nautilus-cd-burner/cdspin8.png
+share/nautilus-cd-burner/nautilus-cd-burner.glade
 @dirrm share/nautilus-cd-burner
+@comment in hicolor-icon-theme: @dirrm share/icons/hicolor/scalable/apps
+@comment in hicolor-icon-theme: @dirrm share/icons/hicolor/24x24/apps
+@comment in hicolor-icon-theme: @dirrm share/icons/hicolor/22x22/apps
+@comment in hicolor-icon-theme: @dirrm share/icons/hicolor/16x16/apps
+@comment in hicolor-icon-theme: @dirrm share/icons/hicolor
 @comment in GConf: @dirrm share/gconf/schemas
-@dirrm share/examples/nautilus-cd-burner/gnome-vfs-2.0/modules
-@dirrm share/examples/nautilus-cd-burner/gnome-vfs-2.0
-@dirrm share/examples/nautilus-cd-burner
 @comment in xdg-dirs: @dirrm share/applications
-@comment in nautilus: @dirrm lib/nautilus/extensions-1.0
-@comment in gnome-vfs: @dirrm lib/gnome-vfs-2.0/modules
+@comment in nautilus: @dirrm lib/nautilus/extensions-2.0
 @dirrm include/libnautilus-burn
diff --git a/sysutils/nautilus-cd-burner/distinfo b/sysutils/nautilus-cd-burner/distinfo
index 0a0e0a9b4bd..a2755ccded6 100644
--- a/sysutils/nautilus-cd-burner/distinfo
+++ b/sysutils/nautilus-cd-burner/distinfo
@@ -1,11 +1,6 @@
-$NetBSD: distinfo,v 1.20 2006/08/03 19:40:11 drochner Exp $
+$NetBSD: distinfo,v 1.21 2008/12/02 19:58:53 wiz Exp $
 
-SHA1 (nautilus-cd-burner-2.14.3.tar.bz2) = 2ba992e3acff124cba3864b8357d7f6ce0ed850a
-RMD160 (nautilus-cd-burner-2.14.3.tar.bz2) = 8c63d69097b07e83ccd657149bde51dab6177182
-Size (nautilus-cd-burner-2.14.3.tar.bz2) = 682257 bytes
-SHA1 (patch-aa) = ac48a5273436eb7bbe6b9ba24a413da6dfadb53e
-SHA1 (patch-ab) = 06428fbc8c5ce065399da0447875d4e2e71093f4
-SHA1 (patch-ac) = 57fc2a4bb747556831f85120a7c65367a58b30dd
-SHA1 (patch-ae) = fcb78f12175441dba3fcdb729309a16e2d05d866
-SHA1 (patch-af) = 60b32582bcb95ee063d6c9e0f48f595af0a3b599
-SHA1 (patch-ag) = 3b822955378ed562226e0876f4f876f5b1bb7047
+SHA1 (nautilus-cd-burner-2.24.0.tar.bz2) = 2acf746c995f19c382c9a7a55a545edcfc8dc29e
+RMD160 (nautilus-cd-burner-2.24.0.tar.bz2) = 22510b8074426b7ed4a718f9f6dfb7f82a37a073
+Size (nautilus-cd-burner-2.24.0.tar.bz2) = 725247 bytes
+SHA1 (patch-ab) = d8668b2806ccc3fe13fdab1fddc5ef98cb8aed3b
diff --git a/sysutils/nautilus-cd-burner/patches/patch-aa b/sysutils/nautilus-cd-burner/patches/patch-aa
deleted file mode 100644
index 79c85399ff5..00000000000
--- a/sysutils/nautilus-cd-burner/patches/patch-aa
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD: patch-aa,v 1.6 2006/06/30 02:54:11 joerg Exp $
-
---- make-iso.c.orig	2006-06-18 01:06:45.000000000 -0700
-+++ make-iso.c
-@@ -26,7 +26,7 @@
- 
- #include "config.h"
- 
--#if defined(__FreeBSD__) || defined(__NetBSD__) || defined(__OpenBSD__)
-+#if defined(__FreeBSD__) || defined(__NetBSD__) || defined(__OpenBSD__) || defined(__DragonFly__)
- #include <sys/param.h>
- #include <sys/mount.h>
- #else
diff --git a/sysutils/nautilus-cd-burner/patches/patch-ab b/sysutils/nautilus-cd-burner/patches/patch-ab
index 14255d12c3b..18e61c519b8 100644
--- a/sysutils/nautilus-cd-burner/patches/patch-ab
+++ b/sysutils/nautilus-cd-burner/patches/patch-ab
@@ -1,8 +1,8 @@
-$NetBSD: patch-ab,v 1.5 2006/06/30 02:54:11 joerg Exp $
+$NetBSD: patch-ab,v 1.6 2008/12/02 19:58:53 wiz Exp $
 
---- nautilus-burn-drive.c.orig	2006-03-22 09:08:38.000000000 -0800
-+++ nautilus-burn-drive.c
-@@ -44,7 +44,7 @@
+--- src/nautilus-burn-drive.c.orig	2008-08-20 02:20:04.000000000 +0000
++++ src/nautilus-burn-drive.c
+@@ -43,7 +43,7 @@
  #include <scsi/sg.h>
  #endif /* __linux__ */
  
@@ -11,38 +11,12 @@ $NetBSD: patch-ab,v 1.5 2006/06/30 02:54:11 joerg Exp $
  #include <sys/cdio.h>
  #include <sys/cdrio.h>
  #include <camlib.h>
-@@ -163,7 +163,7 @@ fill_write_speeds (NautilusBurnDrive *dr
- 	}
- }
+@@ -110,7 +110,7 @@ static struct _media_capacity {
+         { NAUTILUS_BURN_MEDIA_TYPE_DVD_PLUS_R_DL,       9183000000LL },
+ };
  
 -#ifdef __FreeBSD__
 +#if defined(__FreeBSD__) || defined(__DragonFly__)
  
  #define get_ioctl_handle_fd(x) (((struct cam_device *)x)->fd)
  
-@@ -687,7 +687,6 @@ get_disc_type (const char *dev_path)
- 	struct cd_toc_entry              entry;
- 	int                              i;
- #endif
--	int                              type;
- #ifndef CDROM_DATA_TRACK
- #define CDROM_DATA_TRACK 4
- #endif
-@@ -2673,7 +2672,7 @@ linux_scan (gboolean recorder_only)
- 	return drives_list;
- }
- 
--#elif defined (__FreeBSD__)
-+#elif defined(__FreeBSD__) || defined(__DragonFly__)
- 
- static GList *
- freebsd_scan (gboolean recorder_only)
-@@ -2918,7 +2917,7 @@ nautilus_burn_drive_get_list (gboolean r
- 	if (drives == NULL) {
- #if defined (__linux__)
- 		drives = linux_scan (recorder_only);
--#elif defined (__FreeBSD__)
-+#elif defined (__FreeBSD__) || defined(__DragonFly__)
- 		drives = freebsd_scan (recorder_only);
- #else
- 		drives = cdrecord_scan (recorder_only);
diff --git a/sysutils/nautilus-cd-burner/patches/patch-ac b/sysutils/nautilus-cd-burner/patches/patch-ac
deleted file mode 100644
index 60126badd0b..00000000000
--- a/sysutils/nautilus-cd-burner/patches/patch-ac
+++ /dev/null
@@ -1,37 +0,0 @@
-$NetBSD: patch-ac,v 1.3 2006/06/30 02:54:11 joerg Exp $
-
---- transport.hxx.orig	2005-02-22 16:42:41.000000000 -0800
-+++ transport.hxx
-@@ -441,7 +441,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;
-@@ -470,7 +474,7 @@ public:
-     {	return 1;   }
- };
- 
--#elif defined(__FreeBSD__)
-+#elif defined(__FreeBSD__) || defined(__DragonFly__)
- 
- #include <sys/ioctl.h>
- #include <camlib.h>
-@@ -637,7 +641,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;
diff --git a/sysutils/nautilus-cd-burner/patches/patch-ae b/sysutils/nautilus-cd-burner/patches/patch-ae
deleted file mode 100644
index 76d9b12e7a5..00000000000
--- a/sysutils/nautilus-cd-burner/patches/patch-ae
+++ /dev/null
@@ -1,12 +0,0 @@
-$NetBSD: patch-ae,v 1.1 2005/03/22 16:33:55 jmmv Exp $
-
---- config.h.in.orig	2005-03-07 19:56:08.000000000 +0100
-+++ config.h.in
-@@ -105,3 +105,7 @@
- 
- /* Define to empty if `const' does not conform to ANSI C. */
- #undef const
-+
-+/* Define to 1 if you have the `statvfs' function. */
-+#undef HAVE_STATVFS
-+
diff --git a/sysutils/nautilus-cd-burner/patches/patch-af b/sysutils/nautilus-cd-burner/patches/patch-af
deleted file mode 100644
index f6073fc74b5..00000000000
--- a/sysutils/nautilus-cd-burner/patches/patch-af
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD: patch-af,v 1.1 2005/03/22 16:33:55 jmmv Exp $
-
---- configure.orig	2005-03-07 19:55:52.000000000 +0100
-+++ configure
-@@ -22185,7 +22185,7 @@ fi
-           glib_save_LIBS="$LIBS"
-           LIBS="$LIBS $INTLLIBS"
- 
--for ac_func in dcgettext
-+for ac_func in dcgettext statvfs
- do
- as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh`
- echo "$as_me:$LINENO: checking for $ac_func" >&5
diff --git a/sysutils/nautilus-cd-burner/patches/patch-ag b/sysutils/nautilus-cd-burner/patches/patch-ag
deleted file mode 100644
index 424825e0db2..00000000000
--- a/sysutils/nautilus-cd-burner/patches/patch-ag
+++ /dev/null
@@ -1,12 +0,0 @@
-$NetBSD: patch-ag,v 1.1 2006/06/30 02:54:11 joerg Exp $
-
---- mapping-protocol.c.orig	2006-06-27 18:17:40.000000000 +0000
-+++ mapping-protocol.c
-@@ -28,6 +28,7 @@
- #include <string.h>
- #include <fcntl.h>
- #include <errno.h>
-+#include <sys/time.h>
- 
- #include "mapping-protocol.h"
-