Remove these ports now that they have been merged into the FreeBSD ports tree.

git-svn-id: svn://creme-brulee.marcuscom.com/ports/trunk@10818 df743ca5-7f9a-e211-a948-0013205c9059

156 files changed, 0 insertions, 16675 deletions

diff --git a/sysutils/brasero/Makefile b/sysutils/brasero/Makefile
deleted file mode 100644
index f7b533a9d..000000000
--- a/sysutils/brasero/Makefile
+++ /dev/null
@@ -1,38 +0,0 @@
-# New ports collection makefile for:	bonfire
-# Date created:		2006-05-12
-# Whom:			Michael Johnson <ahze@FreeBSD.org>
-#
-# $FreeBSD$
-#    $MCom: ports/sysutils/brasero/Makefile,v 1.22 2008/02/06 07:11:03 marcus Exp $
-
-PORTNAME=	brasero
-PORTVERSION=	0.7.1
-PORTREVISION=	1
-CATEGORIES=	sysutils audio multimedia gnome
-MASTER_SITES=	${MASTER_SITE_GNOME}
-MASTER_SITE_SUBDIR=	sources/${PORTNAME}/${PORTVERSION:C/^([0-9]+\.[0-9]+).*/\1/}
-DIST_SUBDIR=	gnome2
-
-MAINTAINER=	gnome@FreeBSD.org
-COMMENT=	CD/DVD mastering tool for the GNOME desktop
-
-LIB_DEPENDS=	notify.1:${PORTSDIR}/devel/libnotify \
-		totem-plparser.10:${PORTSDIR}/multimedia/totem-pl-parser
-
-USE_GETTEXT=	yes
-USE_BZIP2=	yes
-GNU_CONFIGURE=	yes
-USE_GMAKE=	yes
-USE_XLIB=	yes
-USE_GNOME=	gnomehier nautiluscdburner
-USE_GSTREAMER=	gconf core
-INSTALLS_ICONS=	yes
-CONFIGURE_ARGS=	--disable-inotify \
-		--with-cam
-CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" \
-		LDFLAGS="-L${LOCALBASE}/lib"
-
-MAN1=		brasero.1
-GCONF_SCHEMAS=	brasero.schemas
-
-.include <bsd.port.mk>
diff --git a/sysutils/brasero/distinfo b/sysutils/brasero/distinfo
deleted file mode 100644
index ba88da57f..000000000
--- a/sysutils/brasero/distinfo
+++ /dev/null
@@ -1,3 +0,0 @@
-MD5 (gnome2/brasero-0.7.1.tar.bz2) = 2754fca21c31f00016981cc8fe7c48be
-SHA256 (gnome2/brasero-0.7.1.tar.bz2) = 0ad851ba9f05c2e4ae0778e61c74aee56bbae3a4181b172009698cde03387f5c
-SIZE (gnome2/brasero-0.7.1.tar.bz2) = 1483716
diff --git a/sysutils/brasero/files/patch-configure b/sysutils/brasero/files/patch-configure
deleted file mode 100644
index 3f4958a84..000000000
--- a/sysutils/brasero/files/patch-configure
+++ /dev/null
@@ -1,264 +0,0 @@
---- configure.orig	2008-01-24 16:49:00.000000000 -0500
-+++ configure	2008-01-24 16:49:16.000000000 -0500
-@@ -885,6 +885,8 @@ BRASERO_BASE_CFLAGS
- BRASERO_BASE_LIBS
- BRASERO_CFLAGS
- BRASERO_LIBS
-+WITH_CAM_TRUE
-+WITH_CAM_FALSE
- LIBBURNIA_CFLAGS
- LIBBURNIA_LIBS
- BRASERO_LIBBURNIA_CFLAGS
-@@ -1610,6 +1612,7 @@ Optional Packages:
-   --with-pic              try to use only PIC/non-PIC objects [default=use
-                           both]
-   --with-tags[=TAGS]      include additional configurations [automatic]
-+  --with-cam			Build with CAM backend instead of Linux SCSI [default = no]
-   --with-gconf-source=sourceaddress      Config database for installing schema files.
-   --with-gconf-schema-file-dir=dir        Directory for installing schema files.
- 
-@@ -4514,7 +4517,7 @@ ia64-*-hpux*)
-   ;;
- *-*-irix6*)
-   # Find out which ABI we are using.
--  echo '#line 4517 "configure"' > conftest.$ac_ext
-+  echo '#line 4520 "configure"' > conftest.$ac_ext
-   if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
-   (eval $ac_compile) 2>&5
-   ac_status=$?
-@@ -7252,11 +7255,11 @@ else
-    -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
-    -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
-    -e 's:$: $lt_compiler_flag:'`
--   (eval echo "\"\$as_me:7255: $lt_compile\"" >&5)
-+   (eval echo "\"\$as_me:7258: $lt_compile\"" >&5)
-    (eval "$lt_compile" 2>conftest.err)
-    ac_status=$?
-    cat conftest.err >&5
--   echo "$as_me:7259: \$? = $ac_status" >&5
-+   echo "$as_me:7262: \$? = $ac_status" >&5
-    if (exit $ac_status) && test -s "$ac_outfile"; then
-      # The compiler can only warn and ignore the option if not recognized
-      # So say no if there are warnings other than the usual output.
-@@ -7542,11 +7545,11 @@ else
-    -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
-    -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
-    -e 's:$: $lt_compiler_flag:'`
--   (eval echo "\"\$as_me:7545: $lt_compile\"" >&5)
-+   (eval echo "\"\$as_me:7548: $lt_compile\"" >&5)
-    (eval "$lt_compile" 2>conftest.err)
-    ac_status=$?
-    cat conftest.err >&5
--   echo "$as_me:7549: \$? = $ac_status" >&5
-+   echo "$as_me:7552: \$? = $ac_status" >&5
-    if (exit $ac_status) && test -s "$ac_outfile"; then
-      # The compiler can only warn and ignore the option if not recognized
-      # So say no if there are warnings other than the usual output.
-@@ -7646,11 +7649,11 @@ else
-    -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
-    -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
-    -e 's:$: $lt_compiler_flag:'`
--   (eval echo "\"\$as_me:7649: $lt_compile\"" >&5)
-+   (eval echo "\"\$as_me:7652: $lt_compile\"" >&5)
-    (eval "$lt_compile" 2>out/conftest.err)
-    ac_status=$?
-    cat out/conftest.err >&5
--   echo "$as_me:7653: \$? = $ac_status" >&5
-+   echo "$as_me:7656: \$? = $ac_status" >&5
-    if (exit $ac_status) && test -s out/conftest2.$ac_objext
-    then
-      # The compiler can only warn and ignore the option if not recognized
-@@ -9997,7 +10000,7 @@ else
-   lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
-   lt_status=$lt_dlunknown
-   cat > conftest.$ac_ext <<EOF
--#line 10000 "configure"
-+#line 10003 "configure"
- #include "confdefs.h"
- 
- #if HAVE_DLFCN_H
-@@ -10097,7 +10100,7 @@ else
-   lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
-   lt_status=$lt_dlunknown
-   cat > conftest.$ac_ext <<EOF
--#line 10100 "configure"
-+#line 10103 "configure"
- #include "confdefs.h"
- 
- #if HAVE_DLFCN_H
-@@ -12517,11 +12520,11 @@ else
-    -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
-    -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
-    -e 's:$: $lt_compiler_flag:'`
--   (eval echo "\"\$as_me:12520: $lt_compile\"" >&5)
-+   (eval echo "\"\$as_me:12523: $lt_compile\"" >&5)
-    (eval "$lt_compile" 2>conftest.err)
-    ac_status=$?
-    cat conftest.err >&5
--   echo "$as_me:12524: \$? = $ac_status" >&5
-+   echo "$as_me:12527: \$? = $ac_status" >&5
-    if (exit $ac_status) && test -s "$ac_outfile"; then
-      # The compiler can only warn and ignore the option if not recognized
-      # So say no if there are warnings other than the usual output.
-@@ -12621,11 +12624,11 @@ else
-    -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
-    -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
-    -e 's:$: $lt_compiler_flag:'`
--   (eval echo "\"\$as_me:12624: $lt_compile\"" >&5)
-+   (eval echo "\"\$as_me:12627: $lt_compile\"" >&5)
-    (eval "$lt_compile" 2>out/conftest.err)
-    ac_status=$?
-    cat out/conftest.err >&5
--   echo "$as_me:12628: \$? = $ac_status" >&5
-+   echo "$as_me:12631: \$? = $ac_status" >&5
-    if (exit $ac_status) && test -s out/conftest2.$ac_objext
-    then
-      # The compiler can only warn and ignore the option if not recognized
-@@ -14185,11 +14188,11 @@ else
-    -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
-    -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
-    -e 's:$: $lt_compiler_flag:'`
--   (eval echo "\"\$as_me:14188: $lt_compile\"" >&5)
-+   (eval echo "\"\$as_me:14191: $lt_compile\"" >&5)
-    (eval "$lt_compile" 2>conftest.err)
-    ac_status=$?
-    cat conftest.err >&5
--   echo "$as_me:14192: \$? = $ac_status" >&5
-+   echo "$as_me:14195: \$? = $ac_status" >&5
-    if (exit $ac_status) && test -s "$ac_outfile"; then
-      # The compiler can only warn and ignore the option if not recognized
-      # So say no if there are warnings other than the usual output.
-@@ -14289,11 +14292,11 @@ else
-    -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
-    -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
-    -e 's:$: $lt_compiler_flag:'`
--   (eval echo "\"\$as_me:14292: $lt_compile\"" >&5)
-+   (eval echo "\"\$as_me:14295: $lt_compile\"" >&5)
-    (eval "$lt_compile" 2>out/conftest.err)
-    ac_status=$?
-    cat out/conftest.err >&5
--   echo "$as_me:14296: \$? = $ac_status" >&5
-+   echo "$as_me:14299: \$? = $ac_status" >&5
-    if (exit $ac_status) && test -s out/conftest2.$ac_objext
-    then
-      # The compiler can only warn and ignore the option if not recognized
-@@ -16478,11 +16481,11 @@ else
-    -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
-    -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
-    -e 's:$: $lt_compiler_flag:'`
--   (eval echo "\"\$as_me:16481: $lt_compile\"" >&5)
-+   (eval echo "\"\$as_me:16484: $lt_compile\"" >&5)
-    (eval "$lt_compile" 2>conftest.err)
-    ac_status=$?
-    cat conftest.err >&5
--   echo "$as_me:16485: \$? = $ac_status" >&5
-+   echo "$as_me:16488: \$? = $ac_status" >&5
-    if (exit $ac_status) && test -s "$ac_outfile"; then
-      # The compiler can only warn and ignore the option if not recognized
-      # So say no if there are warnings other than the usual output.
-@@ -16768,11 +16771,11 @@ else
-    -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
-    -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
-    -e 's:$: $lt_compiler_flag:'`
--   (eval echo "\"\$as_me:16771: $lt_compile\"" >&5)
-+   (eval echo "\"\$as_me:16774: $lt_compile\"" >&5)
-    (eval "$lt_compile" 2>conftest.err)
-    ac_status=$?
-    cat conftest.err >&5
--   echo "$as_me:16775: \$? = $ac_status" >&5
-+   echo "$as_me:16778: \$? = $ac_status" >&5
-    if (exit $ac_status) && test -s "$ac_outfile"; then
-      # The compiler can only warn and ignore the option if not recognized
-      # So say no if there are warnings other than the usual output.
-@@ -16872,11 +16875,11 @@ else
-    -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
-    -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
-    -e 's:$: $lt_compiler_flag:'`
--   (eval echo "\"\$as_me:16875: $lt_compile\"" >&5)
-+   (eval echo "\"\$as_me:16878: $lt_compile\"" >&5)
-    (eval "$lt_compile" 2>out/conftest.err)
-    ac_status=$?
-    cat out/conftest.err >&5
--   echo "$as_me:16879: \$? = $ac_status" >&5
-+   echo "$as_me:16882: \$? = $ac_status" >&5
-    if (exit $ac_status) && test -s out/conftest2.$ac_objext
-    then
-      # The compiler can only warn and ignore the option if not recognized
-@@ -22350,6 +22353,27 @@ BRASERO_LIBS="$BRASERO_BASE_LIBS $BRASER
- LIBBURN_REQUIRED=0.4.0
- LIBISOFS_REQUIRED=0.2.8
- 
-+
-+# Check whether --with-cam was given.
-+if test "${with_cam+set}" = set; then
-+  withval=$with_cam;
-+else
-+  with_cam="no"
-+fi
-+
-+
-+if text x"$with_cam" = "xyes"; then
-+    BRASERO_LIBS="$BRASERO_LIBS -lcam"
-+fi
-+ if test x"$with_cam" = "xyes"; then
-+  WITH_CAM_TRUE=
-+  WITH_CAM_FALSE='#'
-+else
-+  WITH_CAM_TRUE='#'
-+  WITH_CAM_FALSE=
-+fi
-+
-+
- # Check whether --enable-libburnia was given.
- if test "${enable_libburnia+set}" = set; then
-   enableval=$enable_libburnia;
-@@ -25144,6 +25168,13 @@ echo "$as_me: error: conditional \"am__f
- Usually this means the macro was only invoked conditionally." >&2;}
-    { (exit 1); exit 1; }; }
- fi
-+if test -z "${WITH_CAM_TRUE}" && test -z "${WITH_CAM_FALSE}"; then
-+  { { echo "$as_me:$LINENO: error: conditional \"WITH_CAM\" was never defined.
-+Usually this means the macro was only invoked conditionally." >&5
-+echo "$as_me: error: conditional \"WITH_CAM\" was never defined.
-+Usually this means the macro was only invoked conditionally." >&2;}
-+   { (exit 1); exit 1; }; }
-+fi
- if test -z "${BUILD_LIBBURNIA_TRUE}" && test -z "${BUILD_LIBBURNIA_FALSE}"; then
-   { { echo "$as_me:$LINENO: error: conditional \"BUILD_LIBBURNIA\" was never defined.
- Usually this means the macro was only invoked conditionally." >&5
-@@ -25945,6 +25976,8 @@ BRASERO_BASE_CFLAGS!$BRASERO_BASE_CFLAGS
- BRASERO_BASE_LIBS!$BRASERO_BASE_LIBS$ac_delim
- BRASERO_CFLAGS!$BRASERO_CFLAGS$ac_delim
- BRASERO_LIBS!$BRASERO_LIBS$ac_delim
-+WITH_CAM_TRUE!$WITH_CAM_TRUE$ac_delim
-+WITH_CAM_FALSE!$WITH_CAM_FALSE$ac_delim
- LIBBURNIA_CFLAGS!$LIBBURNIA_CFLAGS$ac_delim
- LIBBURNIA_LIBS!$LIBBURNIA_LIBS$ac_delim
- BRASERO_LIBBURNIA_CFLAGS!$BRASERO_LIBBURNIA_CFLAGS$ac_delim
-@@ -26019,8 +26052,6 @@ INTLTOOL_UPDATE!$INTLTOOL_UPDATE$ac_deli
- INTLTOOL_PERL!$INTLTOOL_PERL$ac_delim
- ALL_LINGUAS!$ALL_LINGUAS$ac_delim
- SCHEMAS_INSTALL_TRUE!$SCHEMAS_INSTALL_TRUE$ac_delim
--SCHEMAS_INSTALL_FALSE!$SCHEMAS_INSTALL_FALSE$ac_delim
--GCONFTOOL!$GCONFTOOL$ac_delim
- _ACEOF
- 
-   if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed | grep -c X` = 97; then
-@@ -26062,6 +26093,8 @@ _ACEOF
- ac_delim='%!_!# '
- for ac_last_try in false false false false false :; do
-   cat >conf$$subs.sed <<_ACEOF
-+SCHEMAS_INSTALL_FALSE!$SCHEMAS_INSTALL_FALSE$ac_delim
-+GCONFTOOL!$GCONFTOOL$ac_delim
- GCONF_SCHEMA_CONFIG_SOURCE!$GCONF_SCHEMA_CONFIG_SOURCE$ac_delim
- GCONF_SCHEMA_FILE_DIR!$GCONF_SCHEMA_FILE_DIR$ac_delim
- GCONF_SCHEMAS_INSTALL_TRUE!$GCONF_SCHEMAS_INSTALL_TRUE$ac_delim
-@@ -26070,7 +26103,7 @@ LIBOBJS!$LIBOBJS$ac_delim
- LTLIBOBJS!$LTLIBOBJS$ac_delim
- _ACEOF
- 
--  if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed | grep -c X` = 6; then
-+  if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed | grep -c X` = 8; then
-     break
-   elif $ac_last_try; then
-     { { echo "$as_me:$LINENO: error: could not make $CONFIG_STATUS" >&5
diff --git a/sysutils/brasero/files/patch-src_Makefile.in b/sysutils/brasero/files/patch-src_Makefile.in
deleted file mode 100644
index c57255769..000000000
--- a/sysutils/brasero/files/patch-src_Makefile.in
+++ /dev/null
@@ -1,275 +0,0 @@
---- src/Makefile.in.orig	2008-01-24 16:49:38.000000000 -0500
-+++ src/Makefile.in	2008-01-24 16:49:47.000000000 -0500
-@@ -45,7 +45,96 @@ CONFIG_CLEAN_FILES =
- am__installdirs = "$(DESTDIR)$(bindir)"
- binPROGRAMS_INSTALL = $(INSTALL_PROGRAM)
- PROGRAMS = $(bin_PROGRAMS)
-+am__brasero_SOURCES_DIST = brasero-marshal.h brasero-marshal.c main.c \
-+	brasero-utils.h brasero-utils.c burn-dbus.h burn-dbus.c \
-+	brasero-search-entry.c brasero-search-entry.h \
-+	brasero-search-beagle.c brasero-search-beagle.h \
-+	brasero-mime-filter.c brasero-mime-filter.h brasero-playlist.c \
-+	brasero-playlist.h brasero-player.c brasero-player.h \
-+	brasero-menu.h brasero-burn-dialog.c brasero-burn-dialog.h \
-+	brasero-disc-copy-dialog.c brasero-disc-copy-dialog.h \
-+	brasero-blank-dialog.c brasero-blank-dialog.h inotify.h \
-+	brasero-metadata.c brasero-metadata.h inotify-syscalls.h \
-+	brasero-filtered-window.c brasero-filtered-window.h \
-+	brasero-disc.c brasero-disc.h brasero-data-disc.c \
-+	brasero-data-disc.h brasero-audio-disc.c brasero-audio-disc.h \
-+	brasero-project.c brasero-project.h \
-+	brasero-project-type-chooser.c brasero-project-type-chooser.h \
-+	brasero-player-bacon.c brasero-player-bacon.h \
-+	brasero-progress.c brasero-progress.h \
-+	brasero-song-properties.c brasero-song-properties.h \
-+	brasero-tray.c brasero-tray.h burn.c burn.h burn-job.c \
-+	burn-job.h burn-process.c burn-process.h burn-basics.h \
-+	burn-basics.c burn-caps.c burn-caps.h brasero-session.c \
-+	brasero-session.h brasero-app.h brasero-uri-container.c \
-+	brasero-uri-container.h brasero-project-manager.c \
-+	brasero-project-manager.h brasero-layout.c brasero-layout.h \
-+	brasero-file-chooser.c brasero-file-chooser.h \
-+	brasero-project-size.c brasero-project-size.h burn-session.h \
-+	brasero-sum-dialog.c brasero-sum-dialog.h \
-+	brasero-tool-dialog.c brasero-tool-dialog.h brasero-ncb.h \
-+	brasero-ncb.c burn-task.c burn-task.h brasero-vfs.c \
-+	brasero-vfs.h brasero-async-task-manager.c \
-+	brasero-async-task-manager.h eggtreemultidnd.c \
-+	eggtreemultidnd.h brasero-multi-dnd.c brasero-multi-dnd.h \
-+	brasero-image-option-dialog.c brasero-image-option-dialog.h \
-+	brasero-disc-option-dialog.c brasero-disc-option-dialog.h \
-+	brasero-image-type-chooser.c brasero-image-type-chooser.h \
-+	burn-iso9660.c burn-iso9660.h brasero-layout-object.c \
-+	brasero-layout-object.h burn-volume.c burn-volume.h \
-+	burn-susp.c burn-susp.h burn-iso-field.c burn-iso-field.h \
-+	burn-medium.h cam/cam-cdrom.h cam/freebsd_dvd_rw_utils.h \
-+	scsi/scsi-base.h scsi/scsi-command.h scsi/scsi-error.h \
-+	scsi/scsi-get-configuration.h scsi/scsi-mmc1.h \
-+	scsi/scsi-mmc2.h scsi/scsi-opcodes.h \
-+	scsi/scsi-read-disc-info.h scsi/scsi-read-toc-pma-atip.h \
-+	scsi/scsi-sense-data.h scsi/scsi-sg.h scsi/scsi-utils.h \
-+	scsi/scsi-q-subchannel.h scsi/scsi-read-track-information.h \
-+	scsi/scsi-get-performance.h scsi/scsi-mmc3.h \
-+	scsi/scsi-mode-pages.h scsi/scsi-status-page.h \
-+	scsi/scsi-spc1.h scsi/scsi-read-capacity.h \
-+	scsi/scsi-read-disc-structure.h scsi/scsi-dvd-structures.h \
-+	scsi/scsi-read-format-capacities.h scsi/scsi-command.c \
-+	scsi/scsi-get-configuration.c scsi/scsi-read-disc-info.c \
-+	scsi/scsi-read-toc-pma-atip.c scsi/scsi-sense-data.c \
-+	scsi/scsi-sg.c scsi/scsi-error.c \
-+	scsi/scsi-read-track-information.c scsi/scsi-get-performance.c \
-+	scsi/scsi-mode-sense.c scsi/scsi-read-capacity.c \
-+	scsi/scsi-read-disc-structure.c \
-+	scsi/scsi-read-format-capacities.c burn-medium-scsi.c \
-+	cam/cam-cdrom.c cam/freebsd_dvd_rw_utils.c burn-medium-cam.c \
-+	burn-debug.c burn-debug.h burn-track.h burn-plugin.h \
-+	burn-plugin.c burn-plugin-private.h burn-plugin-manager.c \
-+	burn-plugin-manager.h burn-task-ctx.h burn-task-item.c \
-+	burn-task-item.h burn-task-ctx.c burn-mkisofs-base.c \
-+	burn-mkisofs-base.h brasero-drive-selection.h \
-+	brasero-drive-selection.c brasero-src-selection.h \
-+	brasero-src-selection.c brasero-dest-selection.h \
-+	brasero-dest-selection.c brasero-drive-info.c \
-+	brasero-drive-info.h brasero-drive-properties.h \
-+	brasero-drive-properties.c brasero-image-properties.h \
-+	brasero-image-properties.c brasero-xfer.c brasero-xfer.h \
-+	burn-session.c burn-track.c brasero-plugin-manager-ui.c \
-+	brasero-plugin-manager-ui.h brasero-pref.h brasero-pref.c \
-+	brasero-plugin-option.h brasero-plugin-option.c \
-+	brasero-split-dialog.h brasero-split-dialog.c \
-+	brasero-time-button.h brasero-time-button.c brasero-preview.h \
-+	brasero-preview.c burn-image-format.c burn-image-format.h
- am__objects_1 = brasero-marshal.$(OBJEXT)
-+am__objects_2 = scsi-command.$(OBJEXT) \
-+	scsi-get-configuration.$(OBJEXT) scsi-read-disc-info.$(OBJEXT) \
-+	scsi-read-toc-pma-atip.$(OBJEXT) scsi-sense-data.$(OBJEXT) \
-+	scsi-sg.$(OBJEXT) scsi-error.$(OBJEXT) \
-+	scsi-read-track-information.$(OBJEXT) \
-+	scsi-get-performance.$(OBJEXT) scsi-mode-sense.$(OBJEXT) \
-+	scsi-read-capacity.$(OBJEXT) \
-+	scsi-read-disc-structure.$(OBJEXT) \
-+	scsi-read-format-capacities.$(OBJEXT) \
-+	burn-medium-scsi.$(OBJEXT)
-+am__objects_3 = cam-cdrom.$(OBJEXT) freebsd_dvd_rw_utils.$(OBJEXT) \
-+	burn-medium-cam.$(OBJEXT)
-+@WITH_CAM_FALSE@am__objects_4 = $(am__objects_2)
-+@WITH_CAM_TRUE@am__objects_4 = $(am__objects_3)
- am_brasero_OBJECTS = $(am__objects_1) main.$(OBJEXT) \
- 	brasero-utils.$(OBJEXT) burn-dbus.$(OBJEXT) \
- 	brasero-search-entry.$(OBJEXT) brasero-search-beagle.$(OBJEXT) \
-@@ -72,19 +161,11 @@ am_brasero_OBJECTS = $(am__objects_1) ma
- 	brasero-disc-option-dialog.$(OBJEXT) \
- 	brasero-image-type-chooser.$(OBJEXT) burn-iso9660.$(OBJEXT) \
- 	brasero-layout-object.$(OBJEXT) burn-volume.$(OBJEXT) \
--	burn-susp.$(OBJEXT) burn-iso-field.$(OBJEXT) \
--	burn-medium.$(OBJEXT) scsi-command.$(OBJEXT) \
--	scsi-get-configuration.$(OBJEXT) scsi-read-disc-info.$(OBJEXT) \
--	scsi-read-toc-pma-atip.$(OBJEXT) scsi-sense-data.$(OBJEXT) \
--	scsi-sg.$(OBJEXT) scsi-error.$(OBJEXT) \
--	scsi-read-track-information.$(OBJEXT) \
--	scsi-get-performance.$(OBJEXT) scsi-mode-sense.$(OBJEXT) \
--	scsi-read-capacity.$(OBJEXT) \
--	scsi-read-disc-structure.$(OBJEXT) \
--	scsi-read-format-capacities.$(OBJEXT) burn-debug.$(OBJEXT) \
--	burn-plugin.$(OBJEXT) burn-plugin-manager.$(OBJEXT) \
--	burn-task-item.$(OBJEXT) burn-task-ctx.$(OBJEXT) \
--	burn-mkisofs-base.$(OBJEXT) brasero-drive-selection.$(OBJEXT) \
-+	burn-susp.$(OBJEXT) burn-iso-field.$(OBJEXT) $(am__objects_4) \
-+	burn-debug.$(OBJEXT) burn-plugin.$(OBJEXT) \
-+	burn-plugin-manager.$(OBJEXT) burn-task-item.$(OBJEXT) \
-+	burn-task-ctx.$(OBJEXT) burn-mkisofs-base.$(OBJEXT) \
-+	brasero-drive-selection.$(OBJEXT) \
- 	brasero-src-selection.$(OBJEXT) \
- 	brasero-dest-selection.$(OBJEXT) brasero-drive-info.$(OBJEXT) \
- 	brasero-drive-properties.$(OBJEXT) \
-@@ -110,7 +191,7 @@ LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLF
- 	--mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) \
- 	$(LDFLAGS) -o $@
- SOURCES = $(brasero_SOURCES)
--DIST_SOURCES = $(brasero_SOURCES)
-+DIST_SOURCES = $(am__brasero_SOURCES_DIST)
- RECURSIVE_TARGETS = all-recursive check-recursive dvi-recursive \
- 	html-recursive info-recursive install-data-recursive \
- 	install-dvi-recursive install-exec-recursive \
-@@ -316,6 +397,7 @@ INCLUDES = \
- 	-I$(top_srcdir)							\
- 	-I$(top_builddir)						\
- 	-I./scsi							\
-+	-I./cam								\
- 	-I./md5								\
- 	-DBRASERO_LOCALE_DIR=\""$(prefix)/$(DATADIRNAME)/locale"\" 	\
- 	-DBRASERO_PREFIX=\"$(prefix)\"           			\
-@@ -327,9 +409,30 @@ INCLUDES = \
- 
- CLEANFILES = $(RECMARSHALFILES)
- AM_CFLAGS = -g
--EXTRA_DIST = cd-content-marshal.list
-+CAMFILES = cam/cam-cdrom.c		\
-+	   cam/freebsd_dvd_rw_utils.c	\
-+	   burn-medium-cam.c
-+
-+SCSIFILES = scsi/scsi-command.c			\
-+	    scsi/scsi-get-configuration.c	\
-+	    scsi/scsi-read-disc-info.c		\
-+	    scsi/scsi-read-toc-pma-atip.c	\
-+	    scsi/scsi-sense-data.c		\
-+	    scsi/scsi-sg.c			\
-+	    scsi/scsi-error.c			\
-+	    scsi/scsi-read-track-information.c	\
-+	    scsi/scsi-get-performance.c		\
-+	    scsi/scsi-mode-sense.c		\
-+	    scsi/scsi-read-capacity.c		\
-+	    scsi/scsi-read-disc-structure.c	\
-+	    scsi/scsi-read-format-capacities.c	\
-+	    burn-medium-scsi.c
-+
-+EXTRA_DIST = cd-content-marshal.list $(CAMFILES) $(SCSIFILES)
- GLIB_GENMARSHAL = `pkg-config --variable=glib_genmarshal glib-2.0`
- RECMARSHALFILES = brasero-marshal.h brasero-marshal.c 
-+@WITH_CAM_FALSE@SCSISOURCES = $(SCSIFILES)
-+@WITH_CAM_TRUE@SCSISOURCES = $(CAMFILES)
- brasero_SOURCES = \
- 	$(RECMARSHALFILES)			\
- 	main.c		\
-@@ -435,43 +538,32 @@ brasero_SOURCES = \
- 	burn-iso-field.c         \
- 	burn-iso-field.h         \
- 	burn-medium.h         \
--	burn-medium.c         \
-+	cam/cam-cdrom.h		\
-+	cam/freebsd_dvd_rw_utils.h	\
- 	scsi/scsi-base.h         \
--	scsi/scsi-command.c         \
- 	scsi/scsi-command.h         \
- 	scsi/scsi-error.h         \
--	scsi/scsi-get-configuration.c         \
- 	scsi/scsi-get-configuration.h         \
- 	scsi/scsi-mmc1.h         \
- 	scsi/scsi-mmc2.h         \
- 	scsi/scsi-opcodes.h         \
--	scsi/scsi-read-disc-info.c         \
- 	scsi/scsi-read-disc-info.h         \
--	scsi/scsi-read-toc-pma-atip.c         \
- 	scsi/scsi-read-toc-pma-atip.h         \
--	scsi/scsi-sense-data.c         \
- 	scsi/scsi-sense-data.h         \
--	scsi/scsi-sg.c         \
- 	scsi/scsi-sg.h         \
- 	scsi/scsi-utils.h         \
- 	scsi/scsi-q-subchannel.h         \
--	scsi/scsi-error.c         \
--	scsi/scsi-read-track-information.c         \
- 	scsi/scsi-read-track-information.h         \
--	scsi/scsi-get-performance.c         \
- 	scsi/scsi-get-performance.h         \
- 	scsi/scsi-mmc3.h         \
- 	scsi/scsi-mode-pages.h         \
--	scsi/scsi-mode-sense.c         \
- 	scsi/scsi-status-page.h         \
- 	scsi/scsi-spc1.h         \
--	scsi/scsi-read-capacity.c         \
- 	scsi/scsi-read-capacity.h         \
--	scsi/scsi-read-disc-structure.c         \
- 	scsi/scsi-read-disc-structure.h         \
- 	scsi/scsi-dvd-structures.h         \
--	scsi/scsi-read-format-capacities.c         \
- 	scsi/scsi-read-format-capacities.h         \
-+	$(SCSISOURCES)		\
- 	burn-debug.c         \
- 	burn-debug.h         \
- 	burn-track.h         \
-@@ -647,7 +739,8 @@ distclean-compile:
- @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/burn-iso-field.Po@am__quote@
- @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/burn-iso9660.Po@am__quote@
- @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/burn-job.Po@am__quote@
--@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/burn-medium.Po@am__quote@
-+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/burn-medium-cam.Po@am__quote@
-+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/burn-medium-scsi.Po@am__quote@
- @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/burn-mkisofs-base.Po@am__quote@
- @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/burn-plugin-manager.Po@am__quote@
- @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/burn-plugin.Po@am__quote@
-@@ -660,7 +753,9 @@ distclean-compile:
- @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/burn-track.Po@am__quote@
- @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/burn-volume.Po@am__quote@
- @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/burn.Po@am__quote@
-+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/cam-cdrom.Po@am__quote@
- @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/eggtreemultidnd.Po@am__quote@
-+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/freebsd_dvd_rw_utils.Po@am__quote@
- @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/main.Po@am__quote@
- @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/scsi-command.Po@am__quote@
- @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/scsi-error.Po@am__quote@
-@@ -879,6 +974,34 @@ scsi-read-format-capacities.obj: scsi/sc
- @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
- @am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o scsi-read-format-capacities.obj `if test -f 'scsi/scsi-read-format-capacities.c'; then $(CYGPATH_W) 'scsi/scsi-read-format-capacities.c'; else $(CYGPATH_W) '$(srcdir)/scsi/scsi-read-format-capacities.c'; fi`
- 
-+cam-cdrom.o: cam/cam-cdrom.c
-+@am__fastdepCC_TRUE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT cam-cdrom.o -MD -MP -MF $(DEPDIR)/cam-cdrom.Tpo -c -o cam-cdrom.o `test -f 'cam/cam-cdrom.c' || echo '$(srcdir)/'`cam/cam-cdrom.c
-+@am__fastdepCC_TRUE@	mv -f $(DEPDIR)/cam-cdrom.Tpo $(DEPDIR)/cam-cdrom.Po
-+@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='cam/cam-cdrom.c' object='cam-cdrom.o' libtool=no @AMDEPBACKSLASH@
-+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-+@am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o cam-cdrom.o `test -f 'cam/cam-cdrom.c' || echo '$(srcdir)/'`cam/cam-cdrom.c
-+
-+cam-cdrom.obj: cam/cam-cdrom.c
-+@am__fastdepCC_TRUE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT cam-cdrom.obj -MD -MP -MF $(DEPDIR)/cam-cdrom.Tpo -c -o cam-cdrom.obj `if test -f 'cam/cam-cdrom.c'; then $(CYGPATH_W) 'cam/cam-cdrom.c'; else $(CYGPATH_W) '$(srcdir)/cam/cam-cdrom.c'; fi`
-+@am__fastdepCC_TRUE@	mv -f $(DEPDIR)/cam-cdrom.Tpo $(DEPDIR)/cam-cdrom.Po
-+@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='cam/cam-cdrom.c' object='cam-cdrom.obj' libtool=no @AMDEPBACKSLASH@
-+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-+@am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o cam-cdrom.obj `if test -f 'cam/cam-cdrom.c'; then $(CYGPATH_W) 'cam/cam-cdrom.c'; else $(CYGPATH_W) '$(srcdir)/cam/cam-cdrom.c'; fi`
-+
-+freebsd_dvd_rw_utils.o: cam/freebsd_dvd_rw_utils.c
-+@am__fastdepCC_TRUE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT freebsd_dvd_rw_utils.o -MD -MP -MF $(DEPDIR)/freebsd_dvd_rw_utils.Tpo -c -o freebsd_dvd_rw_utils.o `test -f 'cam/freebsd_dvd_rw_utils.c' || echo '$(srcdir)/'`cam/freebsd_dvd_rw_utils.c
-+@am__fastdepCC_TRUE@	mv -f $(DEPDIR)/freebsd_dvd_rw_utils.Tpo $(DEPDIR)/freebsd_dvd_rw_utils.Po
-+@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='cam/freebsd_dvd_rw_utils.c' object='freebsd_dvd_rw_utils.o' libtool=no @AMDEPBACKSLASH@
-+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-+@am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o freebsd_dvd_rw_utils.o `test -f 'cam/freebsd_dvd_rw_utils.c' || echo '$(srcdir)/'`cam/freebsd_dvd_rw_utils.c
-+
-+freebsd_dvd_rw_utils.obj: cam/freebsd_dvd_rw_utils.c
-+@am__fastdepCC_TRUE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT freebsd_dvd_rw_utils.obj -MD -MP -MF $(DEPDIR)/freebsd_dvd_rw_utils.Tpo -c -o freebsd_dvd_rw_utils.obj `if test -f 'cam/freebsd_dvd_rw_utils.c'; then $(CYGPATH_W) 'cam/freebsd_dvd_rw_utils.c'; else $(CYGPATH_W) '$(srcdir)/cam/freebsd_dvd_rw_utils.c'; fi`
-+@am__fastdepCC_TRUE@	mv -f $(DEPDIR)/freebsd_dvd_rw_utils.Tpo $(DEPDIR)/freebsd_dvd_rw_utils.Po
-+@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='cam/freebsd_dvd_rw_utils.c' object='freebsd_dvd_rw_utils.obj' libtool=no @AMDEPBACKSLASH@
-+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-+@am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o freebsd_dvd_rw_utils.obj `if test -f 'cam/freebsd_dvd_rw_utils.c'; then $(CYGPATH_W) 'cam/freebsd_dvd_rw_utils.c'; else $(CYGPATH_W) '$(srcdir)/cam/freebsd_dvd_rw_utils.c'; fi`
-+
- mostlyclean-libtool:
- 	-rm -f *.lo
- 
diff --git a/sysutils/brasero/files/patch-src_brasero-ncb.h b/sysutils/brasero/files/patch-src_brasero-ncb.h
deleted file mode 100644
index bd5106d64..000000000
--- a/sysutils/brasero/files/patch-src_brasero-ncb.h
+++ /dev/null
@@ -1,12 +0,0 @@
---- src/brasero-ncb.h.orig	2008-01-02 15:01:39.000000000 -0500
-+++ src/brasero-ncb.h	2008-01-02 15:02:15.000000000 -0500
-@@ -42,6 +42,9 @@ nautilus_burn_drive_get_drive_type ((dri
- #define NCB_DRIVE_GET_DEVICE(drive) 	\
- nautilus_burn_drive_get_device (drive)
- 
-+#define NCB_DRIVE_GET_CRECORD_DEVICE(drive)	\
-+nautilus_burn_drive_get_cdrecord_device (drive)
-+
- #define NCB_DRIVE_GET_LIST(list, recorders, image)	\
- {	\
- 	NautilusBurnDriveMonitor *monitor;	\
diff --git a/sysutils/brasero/files/patch-src_burn-job.c b/sysutils/brasero/files/patch-src_burn-job.c
deleted file mode 100644
index c26d1bb72..000000000
--- a/sysutils/brasero/files/patch-src_burn-job.c
+++ /dev/null
@@ -1,31 +0,0 @@
---- src/burn-job.c.orig	2008-01-02 15:00:34.000000000 -0500
-+++ src/burn-job.c	2008-01-02 15:01:15.000000000 -0500
-@@ -1300,6 +1300,28 @@ brasero_job_get_device (BraseroJob *self
- }
- 
- BraseroBurnResult
-+brasero_job_get_cdrecord_device (BraseroJob *self, gchar **device)
-+{
-+	BraseroBurnSession *session;
-+	NautilusBurnDrive *drive;
-+	BraseroJobPrivate *priv;
-+	const gchar *path;
-+
-+	BRASERO_JOB_DEBUG (self);
-+
-+	g_return_val_if_fail (device != NULL, BRASERO_BURN_ERR);
-+
-+	priv = BRASERO_JOB_PRIVATE (self);
-+	session = brasero_task_ctx_get_session (priv->ctx);
-+
-+	drive = brasero_burn_session_get_burner (session);
-+	path = NCB_DRIVE_GET_CRECORD_DEVICE (drive);
-+	*device = g_strdup (path);
-+
-+	return BRASERO_BURN_OK;
-+}
-+
-+BraseroBurnResult
- brasero_job_get_media (BraseroJob *self, BraseroMedia *media)
- {
- 	BraseroBurnSession *session;
diff --git a/sysutils/brasero/files/patch-src_burn-job.h b/sysutils/brasero/files/patch-src_burn-job.h
deleted file mode 100644
index d73d8e6e2..000000000
--- a/sysutils/brasero/files/patch-src_burn-job.h
+++ /dev/null
@@ -1,12 +0,0 @@
---- src/burn-job.h.orig	2008-01-02 14:59:55.000000000 -0500
-+++ src/burn-job.h	2008-01-02 15:00:13.000000000 -0500
-@@ -148,6 +148,9 @@ BraseroBurnResult
- brasero_job_get_device (BraseroJob *job, gchar **device);
- 
- BraseroBurnResult
-+brasero_job_get_cdrecord_device (BraseroJob *job, gchar **device);
-+
-+BraseroBurnResult
- brasero_job_get_media (BraseroJob *job, BraseroMedia *media);
- 
- BraseroBurnResult
diff --git a/sysutils/brasero/files/patch-src_burn-medium-cam.c b/sysutils/brasero/files/patch-src_burn-medium-cam.c
deleted file mode 100644
index 2db8d00ca..000000000
--- a/sysutils/brasero/files/patch-src_burn-medium-cam.c
+++ /dev/null
@@ -1,1928 +0,0 @@
---- src/burn-medium-cam.c.orig	2008-02-06 01:53:39.000000000 -0500
-+++ src/burn-medium-cam.c	2008-02-06 01:56:01.000000000 -0500
-@@ -0,0 +1,1925 @@
-+/* -*- Mode: C; indent-tabs-mode: t; c-basic-offset: 8; tab-width: 8 -*- */
-+/*
-+ * brasero
-+ * Copyright (C) Philippe Rouquier 2007 <bonfire-app@wanadoo.fr>
-+ * 		 Joe Marcus Clarke 2007 <marcus@FreeBSD.org>
-+ *
-+ * brasero is free software.
-+ *
-+ * You may redistribute it and/or modify it under the terms of the
-+ * GNU General Public License, as published by the Free Software
-+ * Foundation; either version 2 of the License, or (at your option)
-+ * any later version.
-+ *
-+ * brasero is distributed in the hope that it will be useful,
-+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
-+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
-+ * See the GNU General Public License for more details.
-+ *
-+ * You should have received a copy of the GNU General Public License
-+ * along with brasero.  If not, write to:
-+ * 	The Free Software Foundation, Inc.,
-+ * 	51 Franklin Street, Fifth Floor
-+ * 	Boston, MA  02110-1301, USA.
-+ */
-+
-+#ifdef HAVE_CONFIG_H
-+#  include <config.h>
-+#endif
-+
-+#include <sys/types.h>
-+#include <sys/stat.h>
-+#include <stdlib.h>
-+#include <fcntl.h>
-+#include <errno.h>
-+
-+#include <glib.h>
-+#include <glib/gi18n-lib.h>
-+
-+#include <nautilus-burn-drive.h>
-+
-+#include "burn-basics.h"
-+#include "burn-debug.h"
-+#include "burn-medium.h"
-+#include "cam-cdrom.h"
-+#include "scsi-read-format-capacities.h"
-+#include "scsi-read-toc-pma-atip.h"
-+#include "scsi-get-configuration.h"
-+#include "scsi-q-subchannel.h"
-+#include "scsi-utils.h"
-+#include "freebsd_dvd_rw_utils.h"
-+#include "burn-volume.h"
-+#include "brasero-ncb.h"
-+
-+const gchar *icons [] = { 	"gnome-dev-removable",
-+				"gnome-dev-cdrom",
-+				"gnome-dev-disc-cdr",
-+				"gnome-dev-disc-cdrw",
-+				"gnome-dev-disc-dvdrom",
-+				"gnome-dev-disc-dvdr",
-+				"gnome-dev-disc-dvdrw",
-+				"gnome-dev-disc-dvdr-plus",
-+				"gnome-dev-disc-dvdram",
-+				NULL };
-+const gchar *types [] = {	N_("file"),
-+				N_("CDROM"),
-+				N_("CD-R"),
-+				N_("CD-RW"),
-+				N_("DVDROM"),
-+				N_("DVD-R"),
-+				N_("DVD-RW"),
-+				N_("DVD+R"),
-+				N_("DVD+RW"),
-+				N_("DVD+R dual layer"),
-+				N_("DVD+RW dual layer"),
-+				N_("DVD-R dual layer"),
-+				N_("DVD-RAM"),
-+				N_("Blu-ray disc"),
-+				N_("Writable Blu-ray disc"),
-+				N_("Rewritable Blu-ray disc"),
-+				NULL };
-+
-+
-+typedef struct _BraseroMediumPrivate BraseroMediumPrivate;
-+struct _BraseroMediumPrivate
-+{
-+	gint retry_id;
-+
-+	GSList * tracks;
-+
-+	const gchar *type;
-+	const gchar *icon;
-+
-+	gint max_rd;
-+	gint max_wrt;
-+
-+	gint *rd_speeds;
-+	gint *wr_speeds;
-+
-+	gint64 block_num;
-+	gint64 block_size;
-+
-+	guint64 next_wr_add;
-+	BraseroMedia info;
-+	NautilusBurnDrive * drive;
-+};
-+
-+#define BRASERO_MEDIUM_PRIVATE(o)  (G_TYPE_INSTANCE_GET_PRIVATE ((o), BRASERO_TYPE_MEDIUM, BraseroMediumPrivate))
-+
-+enum
-+{
-+	PROP_0,
-+	PROP_DRIVE
-+};
-+
-+static GObjectClass* parent_class = NULL;
-+
-+const gchar *
-+brasero_medium_get_type_string (BraseroMedium *medium)
-+{
-+	BraseroMediumPrivate *priv;
-+
-+	priv = BRASERO_MEDIUM_PRIVATE (medium);
-+	return priv->type;
-+}
-+
-+const gchar *
-+brasero_medium_get_icon (BraseroMedium *medium)
-+{
-+	BraseroMediumPrivate *priv;
-+
-+	priv = BRASERO_MEDIUM_PRIVATE (medium);
-+	return priv->icon;
-+}
-+
-+BraseroMedia
-+brasero_medium_get_status (BraseroMedium *medium)
-+{
-+	BraseroMediumPrivate *priv;
-+
-+	priv = BRASERO_MEDIUM_PRIVATE (medium);
-+	return priv->info;
-+}
-+
-+GSList *
-+brasero_medium_get_tracks (BraseroMedium *medium)
-+{
-+	BraseroMediumPrivate *priv;
-+
-+	priv = BRASERO_MEDIUM_PRIVATE (medium);
-+	return g_slist_copy (priv->tracks);
-+}
-+
-+gboolean
-+brasero_medium_get_last_data_track_address (BraseroMedium *medium,
-+					    gint64 *byte,
-+					    gint64 *sector)
-+{
-+	GSList *iter;
-+	BraseroMediumPrivate *priv;
-+	BraseroMediumTrack *track = NULL;
-+
-+	priv = BRASERO_MEDIUM_PRIVATE (medium);
-+
-+	for (iter = priv->tracks; iter; iter = iter->next) {
-+		BraseroMediumTrack *current;
-+
-+		current = iter->data;
-+		if (current->type & BRASERO_MEDIUM_TRACK_DATA)
-+			track = current;
-+	}
-+
-+	if (!track) {
-+		if (byte)
-+			*byte = -1;
-+		if (sector)
-+			*sector = -1;
-+		return FALSE;
-+	}
-+
-+	if (byte)
-+		*byte = track->start * priv->block_size;
-+
-+	if (sector)
-+		*sector = track->start;
-+
-+	return TRUE;
-+}
-+
-+gboolean
-+brasero_medium_get_last_data_track_space (BraseroMedium *medium,
-+					  gint64 *size,
-+					  gint64 *blocks)
-+{
-+	GSList *iter;
-+	BraseroMediumPrivate *priv;
-+	BraseroMediumTrack *track = NULL;
-+
-+	priv = BRASERO_MEDIUM_PRIVATE (medium);
-+
-+	for (iter = priv->tracks; iter; iter = iter->next) {
-+		BraseroMediumTrack *current;
-+
-+		current = iter->data;
-+		if (current->type & BRASERO_MEDIUM_TRACK_DATA)
-+			track = current;
-+	}
-+
-+	if (!track) {
-+		if (size)
-+			*size = -1;
-+		if (blocks)
-+			*blocks = -1;
-+		return FALSE;
-+	}
-+
-+	if (size)
-+		*size = track->blocks_num * priv->block_size;
-+	if (blocks)
-+		*blocks = track->blocks_num;
-+
-+	return TRUE;
-+}
-+
-+guint
-+brasero_medium_get_track_num (BraseroMedium *medium)
-+{
-+	guint retval = 0;
-+	GSList *iter;
-+	BraseroMediumPrivate *priv;
-+
-+	priv = BRASERO_MEDIUM_PRIVATE (medium);
-+	for (iter = priv->tracks; iter; iter = iter->next) {
-+		BraseroMediumTrack *current;
-+
-+		current = iter->data;
-+		if (current->type & BRASERO_MEDIUM_TRACK_LEADOUT)
-+			break;
-+
-+		retval ++;
-+	}
-+
-+	return retval;
-+}
-+
-+static BraseroMediumTrack *
-+brasero_medium_get_track (BraseroMedium *medium,
-+			  guint num)
-+{
-+	guint i = 1;
-+	GSList *iter;
-+	BraseroMediumPrivate *priv;
-+
-+	priv = BRASERO_MEDIUM_PRIVATE (medium);
-+
-+	for (iter = priv->tracks; iter; iter = iter->next) {
-+		BraseroMediumTrack *current;
-+
-+		current = iter->data;
-+		if (current->type == BRASERO_MEDIUM_TRACK_LEADOUT)
-+			break;
-+
-+		if (i == num)
-+			return current;
-+
-+		i++;
-+	}
-+
-+	return NULL;
-+}
-+
-+gboolean
-+brasero_medium_get_track_space (BraseroMedium *medium,
-+				guint num,
-+				gint64 *size,
-+				gint64 *blocks)
-+{
-+	BraseroMediumPrivate *priv;
-+	BraseroMediumTrack *track;
-+
-+	priv = BRASERO_MEDIUM_PRIVATE (medium);
-+
-+	track = brasero_medium_get_track (medium, num);
-+	if (!track) {
-+		if (size)
-+			*size = -1;
-+		if (blocks)
-+			*blocks = -1;
-+		return FALSE;
-+	}
-+
-+	if (size)
-+		*size = track->blocks_num * priv->block_size;
-+	if (blocks)
-+		*blocks = track->blocks_num;
-+
-+	return TRUE;
-+}
-+
-+gboolean
-+brasero_medium_get_track_address (BraseroMedium *medium,
-+				  guint num,
-+				  gint64 *byte,
-+				  gint64 *sector)
-+{
-+	BraseroMediumPrivate *priv;
-+	BraseroMediumTrack *track;
-+
-+	priv = BRASERO_MEDIUM_PRIVATE (medium);
-+
-+	track = brasero_medium_get_track (medium, num);
-+	if (!track) {
-+		if (byte)
-+			*byte = -1;
-+		if (sector)
-+			*sector = -1;
-+		return FALSE;
-+	}
-+
-+	if (byte)
-+		*byte = track->start * priv->block_size;
-+	if (sector)
-+		*sector = track->start;
-+
-+	return TRUE;
-+}
-+
-+gint64
-+brasero_medium_get_next_writable_address (BraseroMedium *medium)
-+{
-+	BraseroMediumPrivate *priv;
-+
-+	priv = BRASERO_MEDIUM_PRIVATE (medium);
-+	return priv->next_wr_add;
-+}
-+
-+gint64
-+brasero_medium_get_max_write_speed (BraseroMedium *medium)
-+{
-+	BraseroMediumPrivate *priv;
-+
-+	priv = BRASERO_MEDIUM_PRIVATE (medium);
-+	return priv->max_wrt * 1024;
-+}
-+
-+/**
-+ * NOTEs about the following functions:
-+ * for all closed media (including ROM types) capacity == size of data and
-+ * should be the size of all data on the disc, free space is 0
-+ * for all blank -R types capacity == free space and size of data == 0
-+ * for all multisession -R types capacity == free space since having the real
-+ * capacity of the media would be useless as we can only use this type of media
-+ * to append more data
-+ * for all -RW types capacity = free space + size of data. Here they can be
-+ * appended (use free space) or rewritten (whole capacity).
-+ *
-+ * Usually:
-+ * the free space is the size of the leadout track
-+ * the size of data is the sum of track sizes (excluding leadout)
-+ * the capacity depends on the media:
-+ * for closed discs == sum of track sizes
-+ * for multisession discs == free space (leadout size)
-+ * for blank discs == (free space) leadout size
-+ * for rewritable/blank == use SCSI functions to get capacity (see below)
-+ *
-+ * In fact we should really need the size of data in DVD+/-RW cases since the
-+ * session is always equal to the size of the disc.
-+ */
-+
-+void
-+brasero_medium_get_data_size (BraseroMedium *medium,
-+			      gint64 *size,
-+			      gint64 *blocks)
-+{
-+	GSList *iter;
-+	BraseroMediumPrivate *priv;
-+	BraseroMediumTrack *track = NULL;
-+
-+	priv = BRASERO_MEDIUM_PRIVATE (medium);
-+
-+	if (!priv->tracks) {
-+		/* that's probably because it wasn't possible to retrieve info */
-+		if (size)
-+			*size = 0;
-+
-+		if (blocks)
-+			*blocks = 0;
-+
-+		return;
-+	}
-+
-+	for (iter = priv->tracks; iter; iter = iter->next) {
-+		BraseroMediumTrack *tmp;
-+
-+		tmp = iter->data;
-+		if (tmp->type == BRASERO_MEDIUM_TRACK_LEADOUT)
-+			break;
-+
-+		track = iter->data;
-+	}
-+
-+	if (size)
-+		*size = track ? (track->start + track->blocks_num) * priv->block_size: 0;
-+
-+	if (blocks)
-+		*blocks = track ? track->start + track->blocks_num: 0;
-+}
-+
-+void
-+brasero_medium_get_free_space (BraseroMedium *medium,
-+			       gint64 *size,
-+			       gint64 *blocks)
-+{
-+	GSList *iter;
-+	BraseroMediumPrivate *priv;
-+	BraseroMediumTrack *track = NULL;
-+
-+	priv = BRASERO_MEDIUM_PRIVATE (medium);
-+
-+	if (!priv->tracks) {
-+		/* that's probably because it wasn't possible to retrieve info.
-+		 * maybe it also happens with unformatted DVD+RW */
-+
-+		if (priv->info & BRASERO_MEDIUM_CLOSED) {
-+			if (size)
-+				*size = 0;
-+
-+			if (blocks)
-+				*blocks = 0;
-+		}
-+		else {
-+			if (size)
-+				*size = priv->block_num * priv->block_size;
-+
-+			if (blocks)
-+				*blocks = priv->block_num;
-+		}
-+
-+		return;
-+	}
-+
-+	for (iter = priv->tracks; iter; iter = iter->next) {
-+		BraseroMediumTrack *tmp;
-+
-+		tmp = iter->data;
-+		if (tmp->type == BRASERO_MEDIUM_TRACK_LEADOUT) {
-+			track = iter->data;
-+			break;
-+		}
-+	}
-+
-+	if (size) {
-+		if (!track) {
-+			/* No leadout was found so the disc is probably closed:
-+			 * no free space left. */
-+			*size = 0;
-+		}
-+		else if (track->blocks_num <= 0)
-+			*size = (priv->block_num - track->start) * priv->block_size;
-+		else
-+			*size = track->blocks_num * priv->block_size;
-+	}
-+
-+	if (blocks) {
-+		if (!track) {
-+			/* No leadout was found so the disc is probably closed:
-+			 * no free space left. */
-+			*blocks = 0;
-+		}
-+		else if (track->blocks_num <= 0)
-+			*blocks = priv->block_num - track->blocks_num;
-+		else
-+			*blocks = track->blocks_num;
-+	}
-+}
-+
-+void
-+brasero_medium_get_capacity (BraseroMedium *medium,
-+			     gint64 *size,
-+			     gint64 *blocks)
-+{
-+	BraseroMediumPrivate *priv;
-+
-+	priv = BRASERO_MEDIUM_PRIVATE (medium);
-+
-+	if (priv->info & BRASERO_MEDIUM_REWRITABLE) {
-+		if (size)
-+			*size = priv->block_num * priv->block_size;
-+
-+		if (blocks)
-+			*blocks = priv->block_num;
-+	}
-+	else  if (priv->info & BRASERO_MEDIUM_CLOSED)
-+		brasero_medium_get_data_size (medium, size, blocks);
-+	else
-+		brasero_medium_get_free_space (medium, size, blocks);
-+}
-+
-+/**
-+ * Function to retrieve the capacity of a media
-+ */
-+
-+static BraseroBurnResult
-+brasero_medium_get_capacity_CD_RW (BraseroMedium *self,
-+				   BRASEROCDROM *cdrom)
-+{
-+	unsigned char *atip_data = NULL;
-+	unsigned char *desc;
-+	BraseroMediumPrivate *priv;
-+	int result;
-+	int size;
-+
-+	priv = BRASERO_MEDIUM_PRIVATE (self);
-+
-+	BRASERO_BURN_LOG ("Retrieving capacity from atip");
-+
-+	result = brasero_cdrom_read_atip (cdrom, &atip_data);
-+
-+	if (result != 0) {
-+		g_free (atip_data);
-+
-+		BRASERO_BURN_LOG ("READ ATIP failed (scsi error)");
-+		return BRASERO_BURN_ERR;
-+	}
-+
-+	size = (atip_data[0] << 8 | atip_data[1]) - 2;
-+
-+	/* check the size of the structure: it must be at least 16 bytes long */
-+	if (size < 16) {
-+		if (size)
-+			g_free (atip_data);
-+
-+		BRASERO_BURN_LOG ("READ ATIP failed (wrong size)");
-+		return BRASERO_BURN_ERR;
-+	}
-+
-+	desc = atip_data + 8;
-+
-+	priv->block_num = BRASERO_MSF_TO_LBA (desc[8], desc[9], desc[10]);
-+	g_free (atip_data);
-+
-+	BRASERO_BURN_LOG ("Format capacity %lli %lli",
-+			  priv->block_num,
-+			  priv->block_size);
-+
-+	return BRASERO_BURN_OK;
-+}
-+
-+static BraseroBurnResult
-+brasero_medium_get_capacity_DVD_RW (BraseroMedium *self,
-+				    BRASEROCDROM *cdrom)
-+{
-+	unsigned char *hdr = NULL;
-+	unsigned char *current;
-+	BraseroMediumPrivate *priv;
-+	int result;
-+
-+	BRASERO_BURN_LOG ("Retrieving format capacity");
-+
-+	priv = BRASERO_MEDIUM_PRIVATE (self);
-+	result = brasero_cdrom_read_format_capacities (cdrom, &hdr);
-+	if (result != 0) {
-+		g_free (hdr);
-+
-+		BRASERO_BURN_LOG ("READ FORMAT CAPACITIES failed");
-+		return BRASERO_BURN_ERR;
-+	}
-+
-+	current = hdr + 5;
-+
-+	/* see if the media is already formatted */
-+	if ((current[4] & 3) != BRASERO_SCSI_DESC_FORMATTED) {
-+		int i, max;
-+		unsigned char *desc;
-+
-+		max = (hdr[4] - 8) / 8;
-+
-+		desc = hdr + 5;
-+		for (i = 0; i < max; i ++, desc += 8) {
-+			/* search for the correct descriptor */
-+			if (BRASERO_MEDIUM_IS (priv->info, BRASERO_MEDIUM_DVDRW_PLUS)) {
-+				if ((desc[4] >> 2) == BRASERO_SCSI_DVDRW_PLUS) {
-+					priv->block_num = (desc[0] << 24 | desc[1] << 16 | desc[2] << 8 | desc[3]);
-+					priv->block_size = (desc[5] << 16 | desc[6] << 8 | desc[7]);
-+
-+					/* that can happen */
-+					if (!priv->block_size)
-+						priv->block_size = 2048;
-+					break;
-+				}
-+			}
-+			else if ((desc[4] >> 2) == BRASERO_SCSI_BLOCK_SIZE_DEFAULT_AND_DB) {
-+				priv->block_num = (desc[0] << 24 | desc[1] << 16 | desc[2] << 8 | desc[3]);
-+				priv->block_size = (desc[5] << 16 | desc[6] << 8 | desc[7]);
-+				break;
-+			}
-+		}
-+	}
-+	else {
-+		priv->block_num = (current[0] << 24 | current[1] << 16 | current[2] << 8 | current[3]);
-+		priv->block_size = (current[5] << 16 | current[6] << 8 | current[7]);
-+	}
-+
-+	BRASERO_BURN_LOG ("Format capacity %lli %lli",
-+			  priv->block_num,
-+			  priv->block_size);
-+
-+	g_free (hdr);
-+	return BRASERO_BURN_OK;
-+}
-+
-+static BraseroBurnResult
-+brasero_medium_get_capacity_by_type (BraseroMedium *self,
-+				     BRASEROCDROM *cdrom)
-+{
-+	BraseroMediumPrivate *priv;
-+
-+	priv = BRASERO_MEDIUM_PRIVATE (self);
-+
-+	priv->block_size = 2048;
-+
-+	if (!(priv->info & BRASERO_MEDIUM_REWRITABLE))
-+		return BRASERO_BURN_OK;
-+
-+	if (priv->info & BRASERO_MEDIUM_CD)
-+		brasero_medium_get_capacity_CD_RW (self, cdrom);
-+	else
-+		brasero_medium_get_capacity_DVD_RW (self, cdrom);
-+
-+	return BRASERO_BURN_OK;
-+}
-+
-+/**
-+ * Functions to retrieve the speed
-+ */
-+
-+static BraseroBurnResult
-+brasero_medium_get_speed_mmc3 (BraseroMedium *self,
-+			       BRASEROCDROM *cdrom)
-+{
-+	int size;
-+	int num_desc, i;
-+	gint max_rd, max_wrt;
-+	int result;
-+	BraseroMediumPrivate *priv;
-+	unsigned char *desc;
-+	unsigned char *wrt_perf = NULL;
-+
-+	BRASERO_BURN_LOG ("Retrieving speed (Get Performance)");
-+
-+	/* NOTE: this only work if there is RT streaming feature with
-+	 * wspd bit set to 1. At least an MMC3 drive. */
-+	priv = BRASERO_MEDIUM_PRIVATE (self);
-+	result = brasero_cdrom_get_performance_wrt_spd_desc (cdrom, &wrt_perf);
-+
-+	if (result != 0) {
-+		g_free (wrt_perf);
-+
-+		BRASERO_BURN_LOG ("GET PERFORMANCE failed");
-+		return BRASERO_BURN_ERR;
-+	}
-+
-+	size = 4 + (wrt_perf[0] << 24 | wrt_perf[1] << 16 | wrt_perf[2] << 8 | wrt_perf[3]);
-+
-+	num_desc = (size - 8) / 16;
-+
-+	if (num_desc <=  0)
-+		goto end;
-+
-+	priv->rd_speeds = g_new0 (gint, num_desc + 1);
-+	priv->wr_speeds = g_new0 (gint, num_desc + 1);
-+
-+	max_rd = 0;
-+	max_wrt = 0;
-+
-+	desc = wrt_perf + 8;
-+	for (i = 0; i < num_desc; i ++, desc += 16) {
-+		priv->rd_speeds [i] = (desc[8] << 24 | desc[9] << 16 | desc[10] << 8 || desc[11]);
-+		priv->wr_speeds [i] = (desc[12] << 24 | desc[13] << 16 | desc[14] << 8 | desc[15]);
-+
-+		max_rd = MAX (max_rd, priv->rd_speeds [i]);
-+		max_wrt = MAX (max_wrt, priv->wr_speeds [i]);
-+	}
-+
-+	priv->max_rd = max_rd;
-+	priv->max_wrt = max_wrt;
-+
-+end:
-+
-+	g_free (wrt_perf);
-+
-+	/* strangely there are so drives (I know one case) which support this
-+	 * function but don't report any speed. So if our top speed is 0 then
-+	 * use the other way to get the speed. It was a Teac */
-+	if (!priv->max_wrt)
-+		return BRASERO_BURN_ERR;
-+
-+	return BRASERO_BURN_OK;
-+}
-+
-+static BraseroBurnResult
-+brasero_medium_get_page_2A_write_speed_desc (BraseroMedium *self,
-+					     BRASEROCDROM *cdrom)
-+{
-+	BraseroMediumPrivate *priv;
-+	int result;
-+	char *wspeeds;
-+	int rspeed, wspeed;
-+
-+	BRASERO_BURN_LOG ("Retrieving speed (2A speeds)");
-+
-+	priv = BRASERO_MEDIUM_PRIVATE (self);
-+	result = brasero_cdrom_get_read_write_speed (cdrom, &rspeed, &wspeed, &wspeeds);
-+
-+	if (result != 0) {
-+		BRASERO_BURN_LOG ("MODE SENSE failed");
-+		return BRASERO_BURN_ERR;
-+	}
-+
-+	if (wspeeds != NULL) {
-+		char **speedv;
-+		int i;
-+
-+		speedv = g_strsplit_set (wspeeds, ",", 0);
-+		g_free (wspeeds);
-+		priv->wr_speeds = g_new0 (gint, g_strv_length (speedv) + 1);
-+		for (i = 0; speedv[i] != NULL; i++) {
-+			if (*(speedv[i]))
-+				priv->wr_speeds[i] = atoi (speedv[i]);
-+		}
-+		g_strfreev (speedv);
-+	}
-+
-+	priv->max_wrt = wspeed;
-+	priv->max_rd = rspeed;
-+
-+	return BRASERO_BURN_OK;
-+}
-+
-+static BraseroBurnResult
-+brasero_medium_get_page_2A_max_speed (BraseroMedium *self,
-+				      BRASEROCDROM *cdrom)
-+{
-+	BraseroMediumPrivate *priv;
-+	int result;
-+	int rspeed, wspeed;
-+	char *wspeeds;
-+
-+	BRASERO_BURN_LOG ("Retrieving speed (2A max)");
-+
-+	priv = BRASERO_MEDIUM_PRIVATE (self);
-+
-+	result = brasero_cdrom_get_read_write_speed (cdrom, &rspeed, &wspeed, &wspeeds);
-+
-+	if (result != 0) {
-+		BRASERO_BURN_LOG ("MODE SENSE failed");
-+		return BRASERO_BURN_ERR;
-+	}
-+
-+	priv->max_rd = rspeed;
-+	priv->max_wrt = wspeed;
-+
-+	g_free (wspeeds);
-+
-+	return BRASERO_BURN_OK;
-+}
-+
-+static BraseroBurnResult
-+brasero_medium_get_medium_type (BraseroMedium *self,
-+				BRASEROCDROM *cdrom)
-+{
-+	unsigned char *hdr = NULL;
-+	unsigned char *confdesc;
-+	BraseroMediumPrivate *priv;
-+	BraseroBurnResult result;
-+	int profile;
-+	int res;
-+
-+	BRASERO_BURN_LOG ("Retrieving media profile");
-+
-+	priv = BRASERO_MEDIUM_PRIVATE (self);
-+	res = brasero_cdrom_get_configuration_feature (cdrom,
-+						       BRASERO_SCSI_FEAT_REAL_TIME_STREAM,
-+						       &hdr);
-+	if (res != 0) {
-+		unsigned char *data = NULL;
-+		unsigned char *desc;
-+		int size;
-+
-+		BRASERO_BURN_LOG ("GET CONFIGURATION failed");
-+
-+		/* This could be a MMC1 drive since this command was
-+		 * introduced in MMC2 and is supported onward. So it
-+		 * has to be a CD (R/RW). The rest of the information
-+		 * will be provided by read_disc_information. */
-+
-+		/* The only thing here left to determine is if that's a WRITABLE
-+		 * or a REWRITABLE. To determine that information, we need to
-+		 * read TocPmaAtip. It if fails that's a ROM, if it succeeds.
-+		 */
-+		res = brasero_cdrom_read_atip (cdrom, &data);
-+		if (res != 0) {
-+			/* CDROM */
-+			priv->info = BRASERO_MEDIUM_CDROM;
-+			priv->type = types [1];
-+			priv->icon = icons [1];
-+		}
-+		else {
-+			/* check the size of the structure: it must be at least 8 bytes long */
-+			size = (data[0] << 8 | data[1]) - 2;
-+			if (size < 8) {
-+				if (size)
-+					g_free (data);
-+
-+				BRASERO_BURN_LOG ("READ ATIP failed (wrong size)");
-+				return BRASERO_BURN_ERR;
-+			}
-+
-+			desc = data + 4;
-+
-+			if ((desc[2] >> 6) & 1) {
-+				/* CDRW */
-+				priv->info = BRASERO_MEDIUM_CDRW;
-+				priv->type = types [3];
-+				priv->icon = icons [3];
-+			}
-+			else {
-+				/* CDR */
-+				priv->info = BRASERO_MEDIUM_CDR;
-+				priv->type = types [2];
-+				priv->icon = icons [2];
-+			}
-+
-+			g_free (data);
-+		}
-+
-+		/* retrieve the speed */
-+		result = brasero_medium_get_page_2A_max_speed (self, cdrom);
-+		return result;
-+	}
-+
-+	profile = (hdr[6] << 8 | hdr[7]);
-+
-+	switch (profile) {
-+	case BRASERO_SCSI_PROF_CDROM:
-+		priv->info = BRASERO_MEDIUM_CDROM;
-+		priv->type = types [1];
-+		priv->icon = icons [1];
-+		break;
-+
-+	case BRASERO_SCSI_PROF_CDR:
-+		priv->info = BRASERO_MEDIUM_CDR;
-+		priv->type = types [2];
-+		priv->icon = icons [2];
-+		break;
-+
-+	case BRASERO_SCSI_PROF_CDRW:
-+		priv->info = BRASERO_MEDIUM_CDRW;
-+		priv->type = types [3];
-+		priv->icon = icons [3];
-+		break;
-+
-+	case BRASERO_SCSI_PROF_DVD_ROM:
-+		priv->info = BRASERO_MEDIUM_DVD_ROM;
-+		priv->type = types [4];
-+		priv->icon = icons [4];
-+		break;
-+
-+	case BRASERO_SCSI_PROF_DVD_R:
-+		priv->info = BRASERO_MEDIUM_DVDR;
-+		priv->type = types [5];
-+		priv->icon = icons [5];
-+		break;
-+
-+	case BRASERO_SCSI_PROF_DVD_RW_RESTRICTED:
-+		priv->info = BRASERO_MEDIUM_DVDRW_RESTRICTED;
-+		priv->type = types [6];
-+		priv->icon = icons [6];
-+		break;
-+
-+	case BRASERO_SCSI_PROF_DVD_RW_SEQUENTIAL:
-+		priv->info = BRASERO_MEDIUM_DVDRW;
-+		priv->type = types [6];
-+		priv->icon = icons [6];
-+		break;
-+
-+	case BRASERO_SCSI_PROF_DVD_R_PLUS:
-+		priv->info = BRASERO_MEDIUM_DVDR_PLUS;
-+		priv->type = types [7];
-+		priv->icon = icons [7];
-+		break;
-+
-+	case BRASERO_SCSI_PROF_DVD_RW_PLUS:
-+		priv->info = BRASERO_MEDIUM_DVDRW_PLUS;
-+		priv->type = types [8];
-+		priv->icon = icons [7];
-+		break;
-+
-+	/* WARNING: these types are recognized, no more */
-+	case BRASERO_SCSI_PROF_DVD_R_PLUS_DL:
-+		priv->info = BRASERO_MEDIUM_DVDR_PLUS_DL;
-+		priv->type = types [9];
-+		priv->icon = icons [7];
-+		break;
-+
-+	case BRASERO_SCSI_PROF_DVD_RW_PLUS_DL:
-+		priv->info = BRASERO_MEDIUM_DVDRW_PLUS_DL;
-+		priv->type = types [10];
-+		priv->icon = icons [7];
-+		break;
-+
-+	case BRASERO_SCSI_PROF_DVD_R_DL_SEQUENTIAL:
-+		priv->info = BRASERO_MEDIUM_DVDR_DL;
-+		priv->type = types [11];
-+		priv->icon = icons [5];
-+		break;
-+
-+	case BRASERO_SCSI_PROF_DVD_R_DL_JUMP:
-+		priv->info = BRASERO_MEDIUM_DVDR_JUMP_DL;
-+		priv->type = types [11];
-+		priv->icon = icons [5];
-+		break;
-+
-+	case BRASERO_SCSI_PROF_DVD_RAM:
-+		priv->info = BRASERO_MEDIUM_DVD_RAM;
-+		priv->type = types [12];
-+		priv->icon = icons [8];
-+		break;
-+
-+	case BRASERO_SCSI_PROF_BD_ROM:
-+		priv->info = BRASERO_MEDIUM_BD_ROM;
-+		priv->type = types [13];
-+		priv->icon = icons [4];
-+		break;
-+
-+	case BRASERO_SCSI_PROF_BR_R_SEQUENTIAL:
-+		priv->info = BRASERO_MEDIUM_BDR;
-+		priv->type = types [14];
-+		priv->icon = icons [5];
-+		break;
-+
-+	case BRASERO_SCSI_PROF_BR_R_RANDOM:
-+		priv->info = BRASERO_MEDIUM_BDR_RANDOM;
-+		priv->type = types [14];
-+		priv->icon = icons [5];
-+		break;
-+
-+	case BRASERO_SCSI_PROF_BD_RW:
-+		priv->info = BRASERO_MEDIUM_BDRW;
-+		priv->type = types [15];
-+		priv->icon = icons [6];
-+		break;
-+
-+	case BRASERO_SCSI_PROF_NON_REMOVABLE:
-+	case BRASERO_SCSI_PROF_REMOVABLE:
-+	case BRASERO_SCSI_PROF_MO_ERASABLE:
-+	case BRASERO_SCSI_PROF_MO_WRITE_ONCE:
-+	case BRASERO_SCSI_PROF_MO_ADVANCED_STORAGE:
-+	case BRASERO_SCSI_PROF_DDCD_ROM:
-+	case BRASERO_SCSI_PROF_DDCD_R:
-+	case BRASERO_SCSI_PROF_DDCD_RW:
-+	case BRASERO_SCSI_PROF_HD_DVD_ROM:
-+	case BRASERO_SCSI_PROF_HD_DVD_R:
-+	case BRASERO_SCSI_PROF_HD_DVD_RAM:
-+		priv->info = BRASERO_MEDIUM_UNSUPPORTED;
-+		priv->icon = icons [0];
-+		g_free (hdr);
-+		return BRASERO_BURN_NOT_SUPPORTED;
-+	}
-+
-+	confdesc = hdr + 8;
-+
-+	/* try all SCSI functions to get write/read speeds in order */
-+	if (confdesc[4] >= 4) {
-+		unsigned char *stream;
-+
-+		/* means it's at least an MMC3 drive */
-+		stream = confdesc + 5;
-+		if ((stream[0] >> 1) & 1) {
-+			result = brasero_medium_get_speed_mmc3 (self, cdrom);
-+			if (result == BRASERO_BURN_OK)
-+				goto end;
-+		}
-+
-+		if ((stream[0] >> 2) & 1) {
-+			result = brasero_medium_get_page_2A_write_speed_desc (self, cdrom);
-+			if (result == BRASERO_BURN_OK)
-+				goto end;
-+		}
-+	}
-+
-+	/* fallback for speeds */
-+	result = brasero_medium_get_page_2A_max_speed (self, cdrom);
-+
-+end:
-+
-+	g_free (hdr);
-+
-+	if (result != BRASERO_BURN_OK)
-+		return result;
-+
-+	return BRASERO_BURN_OK;
-+}
-+
-+static BraseroBurnResult
-+brasero_medium_get_css_feature (BraseroMedium *self,
-+				BRASEROCDROM *cdrom)
-+{
-+	unsigned char *hdr = NULL;
-+	BraseroMediumPrivate *priv;
-+	int result;
-+	int size;
-+
-+	priv = BRASERO_MEDIUM_PRIVATE (self);
-+
-+	BRASERO_BURN_LOG ("Testing for Css encrypted media");
-+	result = brasero_cdrom_get_configuration_feature (cdrom,
-+							  BRASERO_SCSI_FEAT_DVD_CSS,
-+							  &hdr);
-+	if (result != 0) {
-+		g_free (hdr);
-+
-+		BRASERO_BURN_LOG ("GET CONFIGURATION failed");
-+		return BRASERO_BURN_ERR;
-+	}
-+
-+	size = 4 + (hdr[0] << 24 | hdr[1] << 16 | hdr[2] << 8 | hdr[3]);
-+
-+	if (size < 9 || hdr[12] < 4) {
-+		g_free (hdr);
-+		return BRASERO_BURN_OK;
-+	}
-+
-+	/* here we just need to see if this feature is current or not */
-+	if (hdr[11] & 1) {
-+		priv->info |= BRASERO_MEDIUM_PROTECTED;
-+		BRASERO_BURN_LOG ("media is Css protected");
-+	}
-+
-+	g_free (hdr);
-+	return BRASERO_BURN_OK;
-+}
-+
-+/**
-+ * Functions to get information about disc contents
-+ */
-+
-+static void
-+brasero_medium_set_track_type (BraseroMedium *self,
-+			       BraseroMediumTrack *track,
-+			       guchar control)
-+{
-+	BraseroMediumPrivate *priv;
-+
-+	priv = BRASERO_MEDIUM_PRIVATE (self);
-+
-+	if (control & BRASERO_SCSI_TRACK_COPY)
-+		track->type |= BRASERO_MEDIUM_TRACK_COPY;
-+
-+	if (!(control & BRASERO_SCSI_TRACK_DATA)) {
-+		track->type |= BRASERO_MEDIUM_TRACK_AUDIO;
-+		priv->info |= BRASERO_MEDIUM_HAS_AUDIO;
-+
-+		if (control & BRASERO_SCSI_TRACK_PREEMP)
-+			track->type |= BRASERO_MEDIUM_TRACK_PREEMP;
-+
-+		if (control & BRASERO_SCSI_TRACK_4_CHANNELS)
-+			track->type |= BRASERO_MEDIUM_TRACK_4_CHANNELS;
-+	}
-+	else {
-+		track->type |= BRASERO_MEDIUM_TRACK_DATA;
-+		priv->info |= BRASERO_MEDIUM_HAS_DATA;
-+
-+		if (control & BRASERO_SCSI_TRACK_DATA_INCREMENTAL)
-+			track->type |= BRASERO_MEDIUM_TRACK_INCREMENTAL;
-+	}
-+}
-+
-+static BraseroBurnResult
-+brasero_medium_track_volume_size (BraseroMedium *self,
-+				  BraseroMediumTrack *track,
-+				  BRASEROCDROM *cdrom)
-+{
-+	BraseroMediumPrivate *priv;
-+	BraseroBurnResult res;
-+	GError *error = NULL;
-+	gint64 nb_blocks;
-+
-+	if (!track)
-+		return BRASERO_BURN_ERR;
-+
-+	priv = BRASERO_MEDIUM_PRIVATE (self);
-+
-+	/* This is a special case. For DVD+RW and DVD-RW in restricted
-+	 * mode, there is only one session that takes the whole disc size
-+	 * once formatted. That doesn't necessarily means they have data
-+	 * Note also that they are reported as complete though you can
-+	 * still add data (with growisofs). It is nevertheless on the
-+	 * condition that the fs is valid.
-+	 * So we check if their first and only volume is valid.
-+	 * That's also used when the track size is reported a 300 Kio
-+	 * see below */
-+	res = brasero_volume_get_size_fd (brasero_cdrom_get_fd (cdrom),
-+					  track->start,
-+					  &nb_blocks,
-+					  NULL);
-+	if (!res) {
-+		BRASERO_BURN_LOG ("Failed to retrieve the volume size: %s",
-+				  error && error->message ?
-+				  error->message:"unknown error");
-+
-+		if (error)
-+			g_error_free (error);
-+		return BRASERO_BURN_ERR;
-+	}
-+
-+	track->blocks_num = nb_blocks;
-+	return BRASERO_BURN_OK;
-+}
-+
-+static BraseroBurnResult
-+brasero_medium_track_get_info (BraseroMedium *self,
-+			       BraseroMediumTrack *track,
-+			       int track_num,
-+			       BRASEROCDROM *cdrom)
-+{
-+	unsigned char track_info[48];
-+	BraseroMediumPrivate *priv;
-+	int result;
-+	int size;
-+	int next_wrt;
-+
-+	BRASERO_BURN_LOG ("Retrieving track information for %i", track_num);
-+
-+	priv = BRASERO_MEDIUM_PRIVATE (self);
-+
-+	/* at this point we know the type of the disc that's why we set the
-+	 * size according to this type. That may help to avoid outrange address
-+	 * errors. */
-+	if (BRASERO_MEDIUM_IS (priv->info, BRASERO_MEDIUM_DL|BRASERO_MEDIUM_WRITABLE))
-+		size = 48;
-+	else if (BRASERO_MEDIUM_IS (priv->info, BRASERO_MEDIUM_PLUS|BRASERO_MEDIUM_WRITABLE))
-+		size = 40;
-+	else
-+		size = 36;
-+
-+	result = brasero_cdrom_read_track_info (cdrom, track_num, track_info, size);
-+
-+	if (result != 0) {
-+		BRASERO_BURN_LOG ("READ TRACK INFO failed");
-+		return BRASERO_BURN_ERR;
-+	}
-+
-+	track->blocks_num = (track_info[24] << 24 | track_info[25] << 16 | track_info[26] << 8 | track_info[27]);
-+	track->session = (track_info[33] << 8 | track_info[3]);
-+
-+	/* Now here is a potential bug: we can write tracks (data or not)
-+	 * shorter than 300 Kio /2 sec but they will be padded to reach this
-+	 * floor value. That means that is blocks_num is 300 blocks that may
-+	 * mean that the data length on the track is actually shorter.
-+	 * So we read the volume descriptor. If it works, good otherwise
-+	 * use the old value.
-+	 * That's important for checksuming to have a perfect account of the
-+	 * data size. */
-+	if (track->blocks_num <= 300) {
-+		BRASERO_BURN_LOG ("300 sectors size. Checking for real size");
-+		brasero_medium_track_volume_size (self, track, cdrom);
-+	}
-+
-+	next_wrt = (track_info[12] << 24 | track_info[13] << 16 | track_info[14] << 7 | track_info[15]);
-+
-+	if (next_wrt);
-+		priv->next_wr_add = next_wrt;
-+
-+	BRASERO_BURN_LOG ("Track %i (session %i): type = %i start = %llu size = %llu",
-+			  track_num,
-+			  track->session,
-+			  track->type,
-+			  track->start,
-+			  track->blocks_num);
-+
-+	return BRASERO_BURN_OK;
-+}
-+
-+/**
-+ * return :
-+ *  0 when it's not possible to determine (fallback to formatted toc)
-+ * -1 for BCD
-+ *  1 for HEX */
-+static guint
-+brasero_medium_check_BCD_use (BraseroMedium *self,
-+			      BRASEROCDROM *cdrom,
-+			      unsigned char *desc,
-+			      guint num)
-+{
-+	guint i;
-+	int size;
-+	guint leadout = 0;
-+	guint track_num = 0;
-+	gboolean use_BCD = TRUE;
-+	gboolean use_HEX = TRUE;
-+	int result;
-+	unsigned char *dptr;
-+	unsigned char track_info[48];
-+	guint start_BCD, start_LBA, track_start;
-+
-+	/* first check if all values are valid BCD numbers in the descriptors */
-+	dptr = desc;
-+	for (i = 0; i < num; i++, dptr += 11) {
-+		if ((dptr[1] >> 4) == 1 && dptr[3] <= BRASERO_SCSI_Q_SUB_CHANNEL_TRACK_START) {
-+			if (!BRASERO_IS_BCD_VALID (dptr[8])
-+			||  !BRASERO_IS_BCD_VALID (dptr[9])
-+			||  !BRASERO_IS_BCD_VALID (dptr[10])) {
-+				use_BCD = FALSE;
-+				break;
-+			}
-+		}
-+		else if (dptr[3] == BRASERO_SCSI_Q_SUB_CHANNEL_LEADOUT_START) {
-+			if (!BRASERO_IS_BCD_VALID (dptr[8])
-+			||  !BRASERO_IS_BCD_VALID (dptr[9])
-+			||  !BRASERO_IS_BCD_VALID (dptr[10])) {
-+				use_BCD = FALSE;
-+				break;
-+			}
-+		}
-+	}
-+
-+	/* then check if there are valid Hex values */
-+	dptr = desc;
-+	for (i = 0; i < num; i++, dptr += 11) {
-+		if ((dptr[i] >> 4) != 1 || dptr[3] > BRASERO_SCSI_Q_SUB_CHANNEL_TRACK_START)
-+			continue;
-+
-+		if (dptr[8] > 99
-+		||  dptr[9] > 59
-+		||  dptr[10] > 74) {
-+			use_HEX = FALSE;
-+			break;
-+		}
-+	}
-+
-+	if (use_BCD != use_HEX) {
-+		if (use_BCD)
-+			return -1;
-+
-+		return 1;
-+	}
-+
-+	/* To check if the drive uses BCD values or HEX values we ask for the
-+	 * track information that contains also the start for the track but in
-+	 * HEX values. If values are the same then it works. */
-+
-+	/* NOTE: there could be another way to do it: get first track, in LBA
-+	 * and BCD it must be 150. */
-+
-+	/* First find the first track and get track start address in BCD */
-+	BRASERO_BURN_LOG ("Retrieving track information to determine number format");
-+
-+	dptr = desc;
-+	for (i = 0; i < num; i++, dptr += 11) {
-+			if ((dptr[1] >> 4) == BRASERO_SCSI_Q_SUB_CHANNEL_LEADIN_MODE5
-+			&&  dptr[3] == BRASERO_SCSI_Q_SUB_CHANNEL_MULTI_NEXT_SESSION) {
-+			/* store the leadout number just in case */
-+			leadout = i;
-+			continue;
-+		}
-+
-+		if ((dptr[1] >> 4) != 1 || dptr[3] > BRASERO_SCSI_Q_SUB_CHANNEL_TRACK_START)
-+			continue;
-+
-+		track_num ++;
-+
-+		start_BCD = BRASERO_MSF_TO_LBA (BRASERO_GET_BCD (dptr[8]),
-+						BRASERO_GET_BCD (dptr[9]),
-+						BRASERO_GET_BCD (dptr[10]));
-+
-+		start_LBA = BRASERO_MSF_TO_LBA (dptr[8], dptr[9], dptr[10]);
-+
-+		BRASERO_BURN_LOG ("Comparing to track information from READ TRACK INFO for track %i", track_num);
-+
-+		size = 36;
-+		start_LBA -= 150;
-+		start_BCD -= 150;
-+
-+		result = brasero_cdrom_read_track_info (cdrom,
-+						        track_num,
-+						        track_info,
-+							size);
-+
-+		if (result != 0) {
-+			BRASERO_BURN_LOG ("READ TRACK INFO failed");
-+			/* Fallback to formatted toc */
-+			return 0;
-+		}
-+
-+		track_start = (track_info[8] << 24 | track_info[9] << 16 | track_info[10] << 8 | track_info[11]);
-+		BRASERO_BURN_LOG ("comparing DCB %i and LBA %i to real start address %i",
-+				  start_BCD, start_LBA, track_start);
-+
-+		/* try to find a conclusive match */
-+		if (track_start == start_BCD && track_start != start_LBA)
-+			return -1;
-+
-+		if (track_start == start_LBA && track_start != start_BCD)
-+			return 1;
-+	}
-+
-+	/* Our last chance, the leadout.
-+	 * NOTE: no need to remove 150 sectors here. */
-+	dptr = desc + (leadout * 11);
-+	start_BCD = BRASERO_MSF_TO_LBA (BRASERO_GET_BCD (dptr[4]),
-+					BRASERO_GET_BCD (dptr[5]),
-+					BRASERO_GET_BCD (dptr[6]));
-+
-+	start_LBA = BRASERO_MSF_TO_LBA (dptr[4], dptr[5], dptr[6]);
-+
-+	BRASERO_BURN_LOG ("Comparing to track information from READ TRACK INFO for leadout");
-+
-+	size = 36;
-+
-+	/* leadout number is number of tracks + 1 */
-+	result = brasero_cdrom_read_track_info (cdrom,
-+					        track_num + 1,
-+					        track_info,
-+						size);
-+
-+	if (result != 0) {
-+		BRASERO_BURN_LOG ("READ TRACK INFO failed for leadout");
-+		/* Fallback to formatted toc */
-+		return 0;
-+	}
-+
-+	track_start = (track_info[8] << 24 | track_info[9] << 16 | track_info[10] << 8 | track_info[11]);
-+	BRASERO_BURN_LOG ("comparing DCB %i and LBA %i to real start address %i",
-+			  start_BCD, start_LBA, track_start);
-+
-+	/* try to find a conclusive match */
-+	if (track_start == start_BCD && track_start != start_LBA)
-+		return -1;
-+
-+	if (track_start == start_LBA && track_start != start_BCD)
-+		return 1;
-+
-+	/* fallback to formatted toc */
-+	return 0;
-+}
-+
-+/**
-+ * The reason why we use this perhaps more lengthy method is that with
-+ * multisession discs, the first track is reported to be two sectors shorter
-+ * than it should. As I don't know why and since the following works we use
-+ * this one. */
-+static BraseroBurnResult
-+brasero_medium_get_CD_sessions_info (BraseroMedium *self,
-+				     BRASEROCDROM *cdrom)
-+{
-+	gint use_bcd;
-+	GSList *iter;
-+	int num, i, size, res;
-+	gint leadout_start = 0;
-+	BraseroMediumPrivate *priv;
-+	unsigned char *desc;
-+	unsigned char *toc = NULL;
-+
-+	BRASERO_BURN_LOG ("Reading Raw Toc");
-+
-+	priv = BRASERO_MEDIUM_PRIVATE (self);
-+
-+	res = brasero_cdrom_read_toc_raw (cdrom, 0, &toc);
-+	if (res != 0) {
-+		BRASERO_BURN_LOG ("READ TOC failed");
-+		return BRASERO_BURN_ERR;
-+	}
-+
-+	size = (toc[0] << 8 | toc[1]) - 2;
-+	num = size / 11;
-+
-+	BRASERO_BURN_LOG ("%i track(s) found", num);
-+
-+	desc = toc + 4;
-+	use_bcd = brasero_medium_check_BCD_use (self, cdrom, desc, num);
-+	if (!use_bcd) {
-+		g_free (toc);
-+
-+		BRASERO_BURN_LOG ("Fallback to formatted toc");
-+		return BRASERO_BURN_ERR;
-+	}
-+
-+	if (use_bcd > 0)
-+		use_bcd = 0;
-+
-+	if (use_bcd) {
-+		BRASERO_BURN_LOG ("Using BCD format");
-+	}
-+	else {
-+		BRASERO_BURN_LOG ("Using HEX format");
-+	}
-+
-+	for (i = 0; i < num; i++, desc += 11) {
-+		BraseroMediumTrack *track;
-+
-+		track = NULL;
-+		if ((desc[1] >> 4) == 1 && desc[3] <= BRASERO_SCSI_Q_SUB_CHANNEL_TRACK_START) {
-+			track = g_new0 (BraseroMediumTrack, 1);
-+			track->session = desc[0];
-+
-+			brasero_medium_set_track_type (self, track, (desc[1] & 15));
-+			if (use_bcd)
-+				track->start = BRASERO_MSF_TO_LBA (BRASERO_GET_BCD (desc[8]),
-+								   BRASERO_GET_BCD (desc[9]),
-+								   BRASERO_GET_BCD (desc[10]));
-+			else
-+				track->start = BRASERO_MSF_TO_LBA (desc[8],
-+								   desc[9],
-+								   desc[10]);
-+
-+			track->start -= 150;
-+
-+			/* if there are tracks and the last previously added track is in
-+			 * the same session then set the size */
-+			if (priv->tracks) {
-+				BraseroMediumTrack *last_track;
-+
-+				last_track = priv->tracks->data;
-+				if (last_track->session == track->session)
-+					last_track->blocks_num = track->start - last_track->start;
-+			}
-+
-+			priv->tracks = g_slist_prepend (priv->tracks, track);
-+		}
-+		else if (desc[3] == BRASERO_SCSI_Q_SUB_CHANNEL_LEADOUT_START) {
-+			/* NOTE: the leadout session is first in the list. So if
-+			 * we have tracks in the list set the last session track
-+			 * size when we reach a new leadout (and therefore a new
-+			 * session). */
-+
-+			if (priv->tracks) {
-+				BraseroMediumTrack *last_track;
-+
-+				last_track = priv->tracks->data;
-+				last_track->blocks_num = leadout_start - last_track->start;
-+			}
-+
-+			if (use_bcd)
-+				leadout_start = BRASERO_MSF_TO_LBA (BRASERO_GET_BCD (desc[8]),
-+								    BRASERO_GET_BCD (desc[9]),
-+								    BRASERO_GET_BCD (desc[10]));
-+			else
-+				leadout_start = BRASERO_MSF_TO_LBA (desc[8],
-+								    desc[9],
-+								    desc[10]);
-+			leadout_start -= 150;
-+		}
-+	}
-+
-+	if (priv->tracks) {
-+		BraseroMediumTrack *last_track;
-+
-+		/* set the last found track size */
-+		last_track = priv->tracks->data;
-+		last_track->blocks_num = leadout_start - last_track->start;
-+	}
-+
-+	/* Add a leadout */
-+	if (!(priv->info & BRASERO_MEDIUM_CLOSED)) {
-+		BraseroMediumTrack *track;
-+
-+		/* we shouldn't request info on leadout if the disc is closed */
-+		track = g_new0 (BraseroMediumTrack, 1);
-+		priv->tracks = g_slist_prepend (priv->tracks, track);
-+		track->start = leadout_start;
-+		track->type = BRASERO_MEDIUM_TRACK_LEADOUT;
-+
-+		brasero_medium_track_get_info (self, track, g_slist_length (priv->tracks), cdrom);
-+	}
-+
-+	priv->tracks = g_slist_reverse (priv->tracks);
-+
-+	for (iter = priv->tracks; iter; iter = iter->next) {
-+		BraseroMediumTrack *track;
-+
-+		track = iter->data;
-+
-+		/* check for tracks less that 300 sectors */
-+		if (track->blocks_num <= 300 && track->type != BRASERO_MEDIUM_TRACK_LEADOUT) {
-+			BRASERO_BURN_LOG ("300 sectors size. Checking for real size");
-+			brasero_medium_track_volume_size (self, track, cdrom);
-+		}
-+
-+		BRASERO_BURN_LOG ("Track %i: type = %i start = %llu size = %llu",
-+				  g_slist_index (priv->tracks, track),
-+				  track->type,
-+				  track->start,
-+				  track->blocks_num);
-+	}
-+
-+	g_free (toc);
-+	return BRASERO_BURN_OK;
-+}
-+
-+/**
-+ * NOTE: for DVD-R multisession we lose 28688 blocks for each session
-+ * so the capacity is the addition of all session sizes + 28688 for each
-+ * For all multisession DVD-/+R and CDR-RW the remaining size is given
-+ * in the leadout. One exception though with DVD+/-RW.
-+ */
-+
-+static void
-+brasero_medium_add_DVD_plus_RW_leadout (BraseroMedium *self,
-+					gint32 start)
-+{
-+	BraseroMediumTrack *leadout;
-+	BraseroMediumPrivate *priv;
-+
-+	priv = BRASERO_MEDIUM_PRIVATE (self);
-+
-+	leadout = g_new0 (BraseroMediumTrack, 1);
-+	priv->tracks = g_slist_append (priv->tracks, leadout);
-+
-+	leadout->start = start;
-+	leadout->type = BRASERO_MEDIUM_TRACK_LEADOUT;
-+
-+	/* we fabricate the leadout here. We don't really need one in
-+	 * fact since it is always at the last sector whatever the
-+	 * amount of data written. So we need in fact to read the file
-+	 * system and get the last sector from it. Hopefully it won't be
-+	 * buggy */
-+	priv->next_wr_add = 0;
-+
-+	leadout->blocks_num = priv->block_num;
-+	if (g_slist_length (priv->tracks) > 1) {
-+		BraseroMediumTrack *track;
-+
-+		track = priv->tracks->data;
-+		leadout->blocks_num -= ((track->blocks_num > 300) ? track->blocks_num : 300);
-+	}
-+	BRASERO_BURN_LOG ("Adding fabricated leadout start = %llu length = %llu",
-+			  leadout->start,
-+			  leadout->blocks_num);
-+}
-+
-+static BraseroBurnResult
-+brasero_medium_get_sessions_info (BraseroMedium *self,
-+				  BRASEROCDROM *cdrom)
-+{
-+	int num, i, size, res;
-+	gint32 tstart;
-+	unsigned char *toc = NULL;
-+	unsigned char *desc;
-+	BraseroMediumPrivate *priv;
-+
-+	BRASERO_BURN_LOG ("Reading Toc");
-+
-+	priv = BRASERO_MEDIUM_PRIVATE (self);
-+	res = brasero_cdrom_read_toc_formatted (cdrom, 0, &toc);
-+	if (res != 0) {
-+		g_free (toc);
-+
-+		BRASERO_BURN_LOG ("READ TOC failed");
-+		return BRASERO_BURN_ERR;
-+	}
-+
-+	size = (toc[0] << 8 | toc[1]) - 2;
-+
-+	num = size / 8; /* Each track description is 8 bytes. */
-+
-+	BRASERO_BURN_LOG ("%i track(s) found", num);
-+
-+	for (desc = toc + 4, i = 0; i < num; i ++, desc += 8) {
-+		BraseroMediumTrack *track;
-+
-+		if (desc[2] == BRASERO_SCSI_TRACK_LEADOUT_START)
-+			break;
-+
-+		tstart = (desc[4] << 24 | desc[5] << 16 | desc[6] << 8 | desc[7]);
-+
-+		track = g_new0 (BraseroMediumTrack, 1);
-+		priv->tracks = g_slist_prepend (priv->tracks, track);
-+		track->start = tstart;
-+
-+		/* we shouldn't request info on a track if the disc is closed */
-+		brasero_medium_track_get_info (self,
-+					       track,
-+					       g_slist_length (priv->tracks),
-+					       cdrom);
-+
-+		if ((desc[1] & 15) & BRASERO_SCSI_TRACK_COPY)
-+			track->type |= BRASERO_MEDIUM_TRACK_COPY;
-+
-+		if (!((desc[1] & 15) & BRASERO_SCSI_TRACK_DATA)) {
-+			track->type |= BRASERO_MEDIUM_TRACK_AUDIO;
-+			priv->info |= BRASERO_MEDIUM_HAS_AUDIO;
-+
-+			if ((desc[1] & 15) & BRASERO_SCSI_TRACK_PREEMP)
-+				track->type |= BRASERO_MEDIUM_TRACK_PREEMP;
-+
-+			if ((desc[1] & 15) & BRASERO_SCSI_TRACK_4_CHANNELS)
-+				track->type |= BRASERO_MEDIUM_TRACK_4_CHANNELS;
-+		}
-+		else if (BRASERO_MEDIUM_IS (priv->info, BRASERO_MEDIUM_DVDRW_PLUS)
-+		     ||  BRASERO_MEDIUM_IS (priv->info, BRASERO_MEDIUM_DVDRW_RESTRICTED)) {
-+			BraseroBurnResult result;
-+
-+			/* a special case for these two kinds of media (DVD+RW)
-+			 * which have only one track: the first. */
-+			result = brasero_medium_track_volume_size (self,
-+								   track,
-+								   cdrom);
-+			if (result == BRASERO_BURN_OK) {
-+				track->type |= BRASERO_MEDIUM_TRACK_DATA;
-+				priv->info |= BRASERO_MEDIUM_HAS_DATA;
-+
-+				priv->next_wr_add = 0;
-+
-+				if ((desc[1] & 15) & BRASERO_SCSI_TRACK_DATA_INCREMENTAL)
-+					track->type |= BRASERO_MEDIUM_TRACK_INCREMENTAL;
-+			}
-+			else {
-+				priv->tracks = g_slist_remove (priv->tracks, track);
-+				g_free (track);
-+
-+				priv->info |= BRASERO_MEDIUM_BLANK;
-+				priv->info &= ~BRASERO_MEDIUM_CLOSED;
-+			}
-+		}
-+		else {
-+			track->type |= BRASERO_MEDIUM_TRACK_DATA;
-+			priv->info |= BRASERO_MEDIUM_HAS_DATA;
-+
-+			if ((desc[1] & 15) & BRASERO_SCSI_TRACK_DATA_INCREMENTAL)
-+				track->type |= BRASERO_MEDIUM_TRACK_INCREMENTAL;
-+		}
-+	}
-+
-+	/* put the tracks in the right order */
-+	priv->tracks = g_slist_reverse (priv->tracks);
-+	tstart = (desc[4] << 24 | desc[5] << 16 | desc[6] << 8 | desc[7]);
-+
-+	if (BRASERO_MEDIUM_IS (priv->info, BRASERO_MEDIUM_DVDRW_PLUS)
-+	||  BRASERO_MEDIUM_IS (priv->info, BRASERO_MEDIUM_DVDRW_RESTRICTED))
-+		brasero_medium_add_DVD_plus_RW_leadout (self, tstart);
-+	else if (!(priv->info & BRASERO_MEDIUM_CLOSED)) {
-+		BraseroMediumTrack *track;
-+
-+		/* we shouldn't request info on leadout if the disc is closed
-+		 * (except for DVD+/- (restricted) RW (see above) */
-+		track = g_new0 (BraseroMediumTrack, 1);
-+		priv->tracks = g_slist_append (priv->tracks, track);
-+		track->start = tstart;
-+		track->type = BRASERO_MEDIUM_TRACK_LEADOUT;
-+
-+		brasero_medium_track_get_info (self,
-+					       track,
-+					       g_slist_length (priv->tracks),
-+					       cdrom);
-+	}
-+
-+	g_free (toc);
-+
-+	return BRASERO_BURN_OK;
-+}
-+
-+static BraseroBurnResult
-+brasero_medium_get_contents (BraseroMedium *self,
-+			     BRASEROCDROM *cdrom)
-+{
-+	BraseroBurnResult result;
-+	int res;
-+	BraseroMediumPrivate *priv;
-+	unsigned char buf[32];
-+
-+	BRASERO_BURN_LOG ("Retrieving media status");
-+
-+	priv = BRASERO_MEDIUM_PRIVATE (self);
-+
-+	res = brasero_cdrom_read_disc_information_std (cdrom, buf);
-+	if (res != 0) {
-+		BRASERO_BURN_LOG ("READ DISC INFORMATION failed");
-+		return BRASERO_BURN_ERR;
-+	}
-+
-+	if (buf[2] & 16) /* Erasable */
-+		priv->info |= BRASERO_MEDIUM_REWRITABLE;
-+
-+	if ((buf[2] & 3) == 0) { /* Empty disc */
-+		BraseroMediumTrack *track;
-+
-+		BRASERO_BURN_LOG ("Empty media");
-+
-+		priv->info |= BRASERO_MEDIUM_BLANK;
-+		priv->block_size = 2048;
-+
-+		if (BRASERO_MEDIUM_IS (priv->info, BRASERO_MEDIUM_DVDRW_PLUS)
-+		||  BRASERO_MEDIUM_IS (priv->info, BRASERO_MEDIUM_DVDRW_RESTRICTED))
-+			brasero_medium_add_DVD_plus_RW_leadout (self, 0);
-+		else {
-+			track = g_new0 (BraseroMediumTrack, 1);
-+			track->start = 0;
-+			track->type = BRASERO_MEDIUM_TRACK_LEADOUT;
-+			priv->tracks = g_slist_prepend (priv->tracks, track);
-+
-+			brasero_medium_track_get_info (self,
-+						       track,
-+						       1,
-+						       cdrom);
-+		}
-+		goto end;
-+	}
-+
-+	if (buf[2] & 1) { /* Appendable */
-+		priv->info |= BRASERO_MEDIUM_APPENDABLE;
-+		BRASERO_BURN_LOG ("Appendable media");
-+	}
-+	else if (buf[2] & 2) { /* Complete */
-+		priv->info |= BRASERO_MEDIUM_CLOSED;
-+		BRASERO_BURN_LOG ("Closed media");
-+	}
-+
-+	if (priv->info & BRASERO_MEDIUM_CD) {
-+		result = brasero_medium_get_CD_sessions_info (self, cdrom);
-+		if (result != BRASERO_BURN_OK)
-+			result = brasero_medium_get_sessions_info (self, cdrom);
-+	}
-+	else
-+		result = brasero_medium_get_sessions_info (self, cdrom);
-+
-+	if (result != BRASERO_BURN_OK)
-+		goto end;
-+
-+end:
-+
-+	return BRASERO_BURN_OK;
-+}
-+
-+static void
-+brasero_medium_init_real (BraseroMedium *object, BRASEROCDROM *cdrom)
-+{
-+	gchar *name;
-+	BraseroBurnResult result;
-+	BraseroMediumPrivate *priv;
-+
-+	priv = BRASERO_MEDIUM_PRIVATE (object);
-+
-+	name = nautilus_burn_drive_get_name_for_display (priv->drive);
-+	BRASERO_BURN_LOG ("Initializing information for medium in %s", name);
-+	g_free (name);
-+
-+	result = brasero_medium_get_medium_type (object, cdrom);
-+	if (result != BRASERO_BURN_OK)
-+		return;
-+
-+	brasero_medium_get_capacity_by_type (object, cdrom);
-+
-+	result = brasero_medium_get_contents (object, cdrom);
-+	if (result != BRASERO_BURN_OK)
-+		return;
-+
-+	/* assume that css feature is only for DVD-ROM which might be wrong but
-+	 * some drives wrongly reports that css is enabled for blank DVD+R/W */
-+	if (BRASERO_MEDIUM_IS (priv->info, (BRASERO_MEDIUM_DVD|BRASERO_MEDIUM_ROM)))
-+		brasero_medium_get_css_feature (object, cdrom);
-+
-+	BRASERO_BURN_LOG_DISC_TYPE (priv->info, "media is ");
-+}
-+
-+static void
-+brasero_medium_try_open (BraseroMedium *self)
-+{
-+	const gchar *path;
-+	BRASEROCDROM *cdrom;
-+	BraseroMediumPrivate *priv;
-+
-+	priv = BRASERO_MEDIUM_PRIVATE (self);
-+	path = nautilus_burn_drive_get_device (priv->drive);
-+
-+	BRASERO_BURN_LOG ("Trying to create BRASERCDROM for device %s", path);
-+	cdrom = brasero_cdrom_new (path);
-+	if (cdrom == NULL) {
-+		BRASERO_BURN_LOG ("Creation failed");
-+		return;
-+	}
-+
-+	BRASERO_BURN_LOG ("Creation succeeded");
-+	brasero_medium_init_real (self, cdrom);
-+	brasero_cdrom_free (cdrom);
-+}
-+
-+static void
-+brasero_medium_init (BraseroMedium *object)
-+{
-+	BraseroMediumPrivate *priv;
-+
-+	priv = BRASERO_MEDIUM_PRIVATE (object);
-+	priv->next_wr_add = -1;
-+
-+	/* we can't do anything here since properties haven't been set yet */
-+}
-+
-+static void
-+brasero_medium_finalize (GObject *object)
-+{
-+	BraseroMediumPrivate *priv;
-+
-+	priv = BRASERO_MEDIUM_PRIVATE (object);
-+
-+	if (priv->retry_id) {
-+		g_source_remove (priv->retry_id);
-+		priv->retry_id = 0;
-+	}
-+
-+	g_free (priv->rd_speeds);
-+	priv->rd_speeds = NULL;
-+
-+	g_free (priv->wr_speeds);
-+	priv->wr_speeds = NULL;
-+
-+	g_slist_foreach (priv->tracks, (GFunc) g_free, NULL);
-+	g_slist_free (priv->tracks);
-+	priv->tracks = NULL;
-+
-+	nautilus_burn_drive_unref (priv->drive);
-+	priv->drive = NULL;
-+
-+	G_OBJECT_CLASS (parent_class)->finalize (object);
-+}
-+
-+static void
-+brasero_medium_set_property (GObject *object, guint prop_id, const GValue *value, GParamSpec *pspec)
-+{
-+	BraseroMediumPrivate *priv;
-+
-+	g_return_if_fail (BRASERO_IS_MEDIUM (object));
-+
-+	priv = BRASERO_MEDIUM_PRIVATE (object);
-+
-+	switch (prop_id)
-+	{
-+	case PROP_DRIVE:
-+		priv->drive = g_value_get_object (value);
-+		nautilus_burn_drive_ref (priv->drive);
-+		brasero_medium_try_open (BRASERO_MEDIUM (object));
-+		break;
-+	default:
-+		G_OBJECT_WARN_INVALID_PROPERTY_ID (object, prop_id, pspec);
-+		break;
-+	}
-+}
-+
-+static void
-+brasero_medium_get_property (GObject *object, guint prop_id, GValue *value, GParamSpec *pspec)
-+{
-+	BraseroMediumPrivate *priv;
-+
-+	g_return_if_fail (BRASERO_IS_MEDIUM (object));
-+
-+	priv = BRASERO_MEDIUM_PRIVATE (object);
-+
-+	switch (prop_id)
-+	{
-+	case PROP_DRIVE:
-+		nautilus_burn_drive_ref (priv->drive);
-+		g_value_set_object (value, priv->drive);
-+		break;
-+	default:
-+		G_OBJECT_WARN_INVALID_PROPERTY_ID (object, prop_id, pspec);
-+		break;
-+	}
-+}
-+
-+static void
-+brasero_medium_class_init (BraseroMediumClass *klass)
-+{
-+	GObjectClass* object_class = G_OBJECT_CLASS (klass);
-+	parent_class = G_OBJECT_CLASS (g_type_class_peek_parent (klass));
-+
-+	g_type_class_add_private (klass, sizeof (BraseroMediumPrivate));
-+
-+	object_class->finalize = brasero_medium_finalize;
-+	object_class->set_property = brasero_medium_set_property;
-+	object_class->get_property = brasero_medium_get_property;
-+
-+	g_object_class_install_property (object_class,
-+	                                 PROP_DRIVE,
-+	                                 g_param_spec_object ("drive",
-+	                                                      "drive",
-+	                                                      "drive in which medium is inserted",
-+	                                                      NAUTILUS_BURN_TYPE_DRIVE,
-+	                                                      G_PARAM_READWRITE | G_PARAM_CONSTRUCT_ONLY));
-+}
-+
-+GType
-+brasero_medium_get_type (void)
-+{
-+	static GType our_type = 0;
-+
-+	if (our_type == 0)
-+	{
-+		static const GTypeInfo our_info =
-+		{
-+			sizeof (BraseroMediumClass), /* class_size */
-+			(GBaseInitFunc) NULL, /* base_init */
-+			(GBaseFinalizeFunc) NULL, /* base_finalize */
-+			(GClassInitFunc) brasero_medium_class_init, /* class_init */
-+			(GClassFinalizeFunc) NULL, /* class_finalize */
-+			NULL /* class_data */,
-+			sizeof (BraseroMedium), /* instance_size */
-+			0, /* n_preallocs */
-+			(GInstanceInitFunc) brasero_medium_init, /* instance_init */
-+			NULL /* value_table */
-+		};
-+
-+		our_type = g_type_register_static (G_TYPE_OBJECT, "BraseroMedium",
-+		                                   &our_info, 0);
-+	}
-+
-+	return our_type;
-+}
-+
-+BraseroMedium *
-+brasero_medium_new (NautilusBurnDrive *drive)
-+{
-+	g_return_val_if_fail (drive != NULL, NULL);
-+	return BRASERO_MEDIUM (g_object_new (BRASERO_TYPE_MEDIUM,
-+					     "drive", drive,
-+					     NULL));
-+}
diff --git a/sysutils/brasero/files/patch-src_burn-medium-scsi.c b/sysutils/brasero/files/patch-src_burn-medium-scsi.c
deleted file mode 100644
index 974754cde..000000000
--- a/sysutils/brasero/files/patch-src_burn-medium-scsi.c
+++ /dev/null
@@ -1,2073 +0,0 @@
---- src/burn-medium-scsi.c.orig	2008-02-06 01:53:39.000000000 -0500
-+++ src/burn-medium-scsi.c	2008-02-06 01:54:19.000000000 -0500
-@@ -0,0 +1,2070 @@
-+/* -*- Mode: C; indent-tabs-mode: t; c-basic-offset: 8; tab-width: 8 -*- */
-+/*
-+ * brasero
-+ * Copyright (C) Philippe Rouquier 2007 <bonfire-app@wanadoo.fr>
-+ * 
-+ * brasero is free software.
-+ * 
-+ * You may redistribute it and/or modify it under the terms of the
-+ * GNU General Public License, as published by the Free Software
-+ * Foundation; either version 2 of the License, or (at your option)
-+ * any later version.
-+ * 
-+ * brasero is distributed in the hope that it will be useful,
-+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
-+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
-+ * See the GNU General Public License for more details.
-+ * 
-+ * You should have received a copy of the GNU General Public License
-+ * along with brasero.  If not, write to:
-+ * 	The Free Software Foundation, Inc.,
-+ * 	51 Franklin Street, Fifth Floor
-+ * 	Boston, MA  02110-1301, USA.
-+ */
-+
-+#ifdef HAVE_CONFIG_H
-+#  include <config.h>
-+#endif
-+
-+#include <sys/types.h>
-+#include <sys/stat.h>
-+#include <fcntl.h>
-+#include <errno.h>
-+
-+#include <glib.h>
-+#include <glib/gi18n-lib.h>
-+
-+#include <nautilus-burn-drive.h>
-+
-+#include "burn-basics.h"
-+#include "burn-debug.h"
-+#include "burn-medium.h"
-+#include "scsi-mmc1.h"
-+#include "scsi-mmc2.h"
-+#include "scsi-mmc3.h"
-+#include "scsi-spc1.h"
-+#include "scsi-utils.h"
-+#include "scsi-mode-pages.h"
-+#include "scsi-status-page.h"
-+#include "scsi-q-subchannel.h"
-+#include "scsi-dvd-structures.h"
-+#include "burn-volume.h"
-+#include "brasero-ncb.h"
-+
-+const gchar *icons [] = { 	"gnome-dev-removable",
-+				"gnome-dev-cdrom",
-+				"gnome-dev-disc-cdr",
-+				"gnome-dev-disc-cdrw",
-+				"gnome-dev-disc-dvdrom",
-+				"gnome-dev-disc-dvdr",
-+				"gnome-dev-disc-dvdrw",
-+				"gnome-dev-disc-dvdr-plus",
-+				"gnome-dev-disc-dvdram",
-+				NULL };
-+const gchar *types [] = {	N_("file"),
-+				N_("CDROM"),
-+				N_("CD-R"),
-+				N_("CD-RW"),
-+				N_("DVDROM"),
-+				N_("DVD-R"),
-+				N_("DVD-RW"),
-+				N_("DVD+R"),
-+				N_("DVD+RW"),
-+				N_("DVD+R dual layer"),
-+				N_("DVD+RW dual layer"),
-+				N_("DVD-R dual layer"),
-+				N_("DVD-RAM"),
-+				N_("Blu-ray disc"),
-+				N_("Writable Blu-ray disc"),
-+				N_("Rewritable Blu-ray disc"),
-+				NULL };
-+
-+
-+typedef struct _BraseroMediumPrivate BraseroMediumPrivate;
-+struct _BraseroMediumPrivate
-+{
-+	gint retry_id;
-+
-+	GSList * tracks;
-+
-+	const gchar *type;
-+	const gchar *icon;
-+
-+	gint max_rd;
-+	gint max_wrt;
-+
-+	gint *rd_speeds;
-+	gint *wr_speeds;
-+
-+	gint64 block_num;
-+	gint64 block_size;
-+
-+	guint64 next_wr_add;
-+	BraseroMedia info;
-+	NautilusBurnDrive * drive;
-+};
-+
-+#define BRASERO_MEDIUM_PRIVATE(o)  (G_TYPE_INSTANCE_GET_PRIVATE ((o), BRASERO_TYPE_MEDIUM, BraseroMediumPrivate))
-+
-+/**
-+ * Try to open the drive exclusively but don't block; if drive can't be opened
-+ * exclusively then retry every second until we're shut or the drive state
-+ * changes to not busy.
-+ * No exclusive at the moment since when the medium is mounted we can't use excl
-+ */
-+
-+#define OPEN_FLAGS			O_RDONLY /*|O_EXCL */|O_NONBLOCK
-+#define BUSY_RETRY_TIME			1000
-+
-+enum
-+{
-+	PROP_0,
-+	PROP_DRIVE
-+};
-+
-+static GObjectClass* parent_class = NULL;
-+
-+const gchar *
-+brasero_medium_get_type_string (BraseroMedium *medium)
-+{
-+	BraseroMediumPrivate *priv;
-+
-+	priv = BRASERO_MEDIUM_PRIVATE (medium);
-+	return priv->type;
-+}
-+
-+const gchar *
-+brasero_medium_get_icon (BraseroMedium *medium)
-+{
-+	BraseroMediumPrivate *priv;
-+
-+	priv = BRASERO_MEDIUM_PRIVATE (medium);
-+	return priv->icon;
-+}
-+
-+BraseroMedia
-+brasero_medium_get_status (BraseroMedium *medium)
-+{
-+	BraseroMediumPrivate *priv;
-+
-+	priv = BRASERO_MEDIUM_PRIVATE (medium);
-+	return priv->info;
-+}
-+
-+GSList *
-+brasero_medium_get_tracks (BraseroMedium *medium)
-+{
-+	BraseroMediumPrivate *priv;
-+
-+	priv = BRASERO_MEDIUM_PRIVATE (medium);
-+	return g_slist_copy (priv->tracks);
-+}
-+
-+gboolean
-+brasero_medium_get_last_data_track_address (BraseroMedium *medium,
-+					    gint64 *byte,
-+					    gint64 *sector)
-+{
-+	GSList *iter;
-+	BraseroMediumPrivate *priv;
-+	BraseroMediumTrack *track = NULL;
-+
-+	priv = BRASERO_MEDIUM_PRIVATE (medium);
-+
-+	for (iter = priv->tracks; iter; iter = iter->next) {
-+		BraseroMediumTrack *current;
-+
-+		current = iter->data;
-+		if (current->type & BRASERO_MEDIUM_TRACK_DATA)
-+			track = current;
-+	}
-+
-+	if (!track) {
-+		if (byte)
-+			*byte = -1;
-+		if (sector)
-+			*sector = -1;
-+		return FALSE;
-+	}
-+
-+	if (byte)
-+		*byte = track->start * priv->block_size;
-+
-+	if (sector)
-+		*sector = track->start;
-+
-+	return TRUE;
-+}
-+
-+gboolean
-+brasero_medium_get_last_data_track_space (BraseroMedium *medium,
-+					  gint64 *size,
-+					  gint64 *blocks)
-+{
-+	GSList *iter;
-+	BraseroMediumPrivate *priv;
-+	BraseroMediumTrack *track = NULL;
-+
-+	priv = BRASERO_MEDIUM_PRIVATE (medium);
-+
-+	for (iter = priv->tracks; iter; iter = iter->next) {
-+		BraseroMediumTrack *current;
-+
-+		current = iter->data;
-+		if (current->type & BRASERO_MEDIUM_TRACK_DATA)
-+			track = current;
-+	}
-+
-+	if (!track) {
-+		if (size)
-+			*size = -1;
-+		if (blocks)
-+			*blocks = -1;
-+		return FALSE;
-+	}
-+
-+	if (size)
-+		*size = track->blocks_num * priv->block_size;
-+	if (blocks)
-+		*blocks = track->blocks_num;
-+
-+	return TRUE;
-+}
-+
-+guint
-+brasero_medium_get_track_num (BraseroMedium *medium)
-+{
-+	guint retval = 0;
-+	GSList *iter;
-+	BraseroMediumPrivate *priv;
-+
-+	priv = BRASERO_MEDIUM_PRIVATE (medium);
-+	for (iter = priv->tracks; iter; iter = iter->next) {
-+		BraseroMediumTrack *current;
-+
-+		current = iter->data;
-+		if (current->type & BRASERO_MEDIUM_TRACK_LEADOUT)
-+			break;
-+
-+		retval ++;
-+	}
-+
-+	return retval;
-+}
-+
-+static BraseroMediumTrack *
-+brasero_medium_get_track (BraseroMedium *medium,
-+			  guint num)
-+{
-+	guint i = 1;
-+	GSList *iter;
-+	BraseroMediumPrivate *priv;
-+
-+	priv = BRASERO_MEDIUM_PRIVATE (medium);
-+
-+	for (iter = priv->tracks; iter; iter = iter->next) {
-+		BraseroMediumTrack *current;
-+
-+		current = iter->data;
-+		if (current->type == BRASERO_MEDIUM_TRACK_LEADOUT)
-+			break;
-+
-+		if (i == num)
-+			return current;
-+
-+		i++;
-+	}
-+
-+	return NULL;
-+}
-+
-+gboolean
-+brasero_medium_get_track_space (BraseroMedium *medium,
-+				guint num,
-+				gint64 *size,
-+				gint64 *blocks)
-+{
-+	BraseroMediumPrivate *priv;
-+	BraseroMediumTrack *track;
-+
-+	priv = BRASERO_MEDIUM_PRIVATE (medium);
-+
-+	track = brasero_medium_get_track (medium, num);
-+	if (!track) {
-+		if (size)
-+			*size = -1;
-+		if (blocks)
-+			*blocks = -1;
-+		return FALSE;
-+	}
-+
-+	if (size)
-+		*size = track->blocks_num * priv->block_size;
-+	if (blocks)
-+		*blocks = track->blocks_num;
-+
-+	return TRUE;
-+}
-+
-+gboolean
-+brasero_medium_get_track_address (BraseroMedium *medium,
-+				  guint num,
-+				  gint64 *byte,
-+				  gint64 *sector)
-+{
-+	BraseroMediumPrivate *priv;
-+	BraseroMediumTrack *track;
-+
-+	priv = BRASERO_MEDIUM_PRIVATE (medium);
-+
-+	track = brasero_medium_get_track (medium, num);
-+	if (!track) {
-+		if (byte)
-+			*byte = -1;
-+		if (sector)
-+			*sector = -1;
-+		return FALSE;
-+	}
-+
-+	if (byte)
-+		*byte = track->start * priv->block_size;
-+	if (sector)
-+		*sector = track->start;
-+
-+	return TRUE;	
-+}
-+
-+gint64
-+brasero_medium_get_next_writable_address (BraseroMedium *medium)
-+{
-+	BraseroMediumPrivate *priv;
-+
-+	priv = BRASERO_MEDIUM_PRIVATE (medium);
-+	return priv->next_wr_add;
-+}
-+
-+gint64
-+brasero_medium_get_max_write_speed (BraseroMedium *medium)
-+{
-+	BraseroMediumPrivate *priv;
-+
-+	priv = BRASERO_MEDIUM_PRIVATE (medium);
-+	return priv->max_wrt * 1024;
-+}
-+
-+/**
-+ * NOTEs about the following functions:
-+ * for all closed media (including ROM types) capacity == size of data and 
-+ * should be the size of all data on the disc, free space is 0
-+ * for all blank -R types capacity == free space and size of data == 0
-+ * for all multisession -R types capacity == free space since having the real
-+ * capacity of the media would be useless as we can only use this type of media
-+ * to append more data
-+ * for all -RW types capacity = free space + size of data. Here they can be 
-+ * appended (use free space) or rewritten (whole capacity).
-+ *
-+ * Usually:
-+ * the free space is the size of the leadout track
-+ * the size of data is the sum of track sizes (excluding leadout)
-+ * the capacity depends on the media:
-+ * for closed discs == sum of track sizes
-+ * for multisession discs == free space (leadout size)
-+ * for blank discs == (free space) leadout size
-+ * for rewritable/blank == use SCSI functions to get capacity (see below)
-+ *
-+ * In fact we should really need the size of data in DVD+/-RW cases since the
-+ * session is always equal to the size of the disc. 
-+ */
-+
-+void
-+brasero_medium_get_data_size (BraseroMedium *medium,
-+			      gint64 *size,
-+			      gint64 *blocks)
-+{
-+	GSList *iter;
-+	BraseroMediumPrivate *priv;
-+	BraseroMediumTrack *track = NULL;
-+
-+	priv = BRASERO_MEDIUM_PRIVATE (medium);
-+
-+	if (!priv->tracks) {
-+		/* that's probably because it wasn't possible to retrieve info */
-+		if (size)
-+			*size = 0;
-+
-+		if (blocks)
-+			*blocks = 0;
-+
-+		return;
-+	}
-+
-+	for (iter = priv->tracks; iter; iter = iter->next) {
-+		BraseroMediumTrack *tmp;
-+
-+		tmp = iter->data;
-+		if (tmp->type == BRASERO_MEDIUM_TRACK_LEADOUT)
-+			break;
-+
-+		track = iter->data;
-+	}
-+
-+	if (size)
-+		*size = track ? (track->start + track->blocks_num) * priv->block_size: 0;
-+
-+	if (blocks)
-+		*blocks = track ? track->start + track->blocks_num: 0;
-+}
-+
-+void
-+brasero_medium_get_free_space (BraseroMedium *medium,
-+			       gint64 *size,
-+			       gint64 *blocks)
-+{
-+	GSList *iter;
-+	BraseroMediumPrivate *priv;
-+	BraseroMediumTrack *track = NULL;
-+
-+	priv = BRASERO_MEDIUM_PRIVATE (medium);
-+
-+	if (!priv->tracks) {
-+		/* that's probably because it wasn't possible to retrieve info.
-+		 * maybe it also happens with unformatted DVD+RW */
-+
-+		if (priv->info & BRASERO_MEDIUM_CLOSED) {
-+			if (size)
-+				*size = 0;
-+
-+			if (blocks)
-+				*blocks = 0;
-+		}
-+		else {
-+			if (size)
-+				*size = priv->block_num * priv->block_size;
-+
-+			if (blocks)
-+				*blocks = priv->block_num;
-+		}
-+
-+		return;
-+	}
-+
-+	for (iter = priv->tracks; iter; iter = iter->next) {
-+		BraseroMediumTrack *tmp;
-+
-+		tmp = iter->data;
-+		if (tmp->type == BRASERO_MEDIUM_TRACK_LEADOUT) {
-+			track = iter->data;
-+			break;
-+		}
-+	}
-+
-+	if (size) {
-+		if (!track) {
-+			/* No leadout was found so the disc is probably closed:
-+			 * no free space left. */
-+			*size = 0;
-+		}
-+		else if (track->blocks_num <= 0)
-+			*size = (priv->block_num - track->start) * priv->block_size;
-+		else
-+			*size = track->blocks_num * priv->block_size;
-+	}
-+
-+	if (blocks) {
-+		if (!track) {
-+			/* No leadout was found so the disc is probably closed:
-+			 * no free space left. */
-+			*blocks = 0;
-+		}
-+		else if (track->blocks_num <= 0)
-+			*blocks = priv->block_num - track->blocks_num;
-+		else
-+			*blocks = track->blocks_num;
-+	}
-+}
-+
-+void
-+brasero_medium_get_capacity (BraseroMedium *medium,
-+			     gint64 *size,
-+			     gint64 *blocks)
-+{
-+	BraseroMediumPrivate *priv;
-+
-+	priv = BRASERO_MEDIUM_PRIVATE (medium);
-+
-+	if (priv->info & BRASERO_MEDIUM_REWRITABLE) {
-+		if (size)
-+			*size = priv->block_num * priv->block_size;
-+
-+		if (blocks)
-+			*blocks = priv->block_num;
-+	}
-+	else  if (priv->info & BRASERO_MEDIUM_CLOSED)
-+		brasero_medium_get_data_size (medium, size, blocks);
-+	else
-+		brasero_medium_get_free_space (medium, size, blocks);
-+}
-+
-+/**
-+ * Function to retrieve the capacity of a media
-+ */
-+
-+static BraseroBurnResult
-+brasero_medium_get_capacity_CD_RW (BraseroMedium *self,
-+				   int fd,
-+				   BraseroScsiErrCode *code)
-+{
-+	BraseroScsiAtipData *atip_data = NULL;
-+	BraseroMediumPrivate *priv;
-+	BraseroScsiResult result;
-+	int size = 0;
-+
-+	priv = BRASERO_MEDIUM_PRIVATE (self);
-+
-+	BRASERO_BURN_LOG ("Retrieving capacity from atip");
-+
-+	result = brasero_mmc1_read_atip (fd,
-+					 &atip_data,
-+					 &size,
-+					 NULL);
-+
-+	if (result != BRASERO_SCSI_OK) {
-+		BRASERO_BURN_LOG ("READ ATIP failed (scsi error)");
-+		return BRASERO_BURN_ERR;
-+	}
-+
-+	/* check the size of the structure: it must be at least 16 bytes long */
-+	if (size < 16) {
-+		if (size)
-+			g_free (atip_data);
-+
-+		BRASERO_BURN_LOG ("READ ATIP failed (wrong size)");
-+		return BRASERO_BURN_ERR;
-+	}
-+
-+	priv->block_num = BRASERO_MSF_TO_LBA (atip_data->desc->leadout_mn,
-+					      atip_data->desc->leadout_sec,
-+					      atip_data->desc->leadout_frame);
-+	g_free (atip_data);
-+
-+	BRASERO_BURN_LOG ("Format capacity %lli %lli",
-+			  priv->block_num,
-+			  priv->block_size);
-+
-+	return BRASERO_BURN_OK;
-+}
-+
-+static BraseroBurnResult
-+brasero_medium_get_capacity_DVD_RW (BraseroMedium *self,
-+				    int fd,
-+				    BraseroScsiErrCode *code)
-+{
-+	BraseroScsiFormatCapacitiesHdr *hdr = NULL;
-+	BraseroScsiMaxCapacityDesc *current;
-+	BraseroMediumPrivate *priv;
-+	BraseroScsiResult result;
-+	gint size;
-+
-+	BRASERO_BURN_LOG ("Retrieving format capacity");
-+
-+	priv = BRASERO_MEDIUM_PRIVATE (self);
-+	result = brasero_mmc2_read_format_capacities (fd,
-+						      &hdr,
-+						      &size,
-+						      code);
-+	if (result != BRASERO_SCSI_OK) {
-+		g_free (hdr);
-+
-+		BRASERO_BURN_LOG ("READ FORMAT CAPACITIES failed");
-+		return BRASERO_BURN_ERR;
-+	}
-+
-+	current = hdr->max_caps;
-+
-+	/* see if the media is already formatted */
-+	if (current->type != BRASERO_SCSI_DESC_FORMATTED) {
-+		int i, max;
-+		BraseroScsiFormattableCapacityDesc *desc;
-+
-+		max = (hdr->len - 
-+		      sizeof (BraseroScsiMaxCapacityDesc)) /
-+		      sizeof (BraseroScsiFormattableCapacityDesc);
-+
-+		desc = hdr->desc;
-+		for (i = 0; i < max; i ++, desc ++) {
-+			/* search for the correct descriptor */
-+			if (BRASERO_MEDIUM_IS (priv->info, BRASERO_MEDIUM_DVDRW_PLUS)) {
-+				if (desc->format_type == BRASERO_SCSI_DVDRW_PLUS) {
-+					priv->block_num = BRASERO_GET_32 (desc->blocks_num);
-+					priv->block_size = BRASERO_GET_24 (desc->type_param);
-+
-+					/* that can happen */
-+					if (!priv->block_size)
-+						priv->block_size = 2048;
-+					break;
-+				}
-+			}
-+			else if (desc->format_type == BRASERO_SCSI_BLOCK_SIZE_DEFAULT_AND_DB) {
-+				priv->block_num = BRASERO_GET_32 (desc->blocks_num);
-+				priv->block_size = BRASERO_GET_24 (desc->type_param);
-+				break;
-+			}
-+		}
-+	}
-+	else {
-+		priv->block_num = BRASERO_GET_32 (current->blocks_num);
-+		priv->block_size = BRASERO_GET_24 (current->block_size);
-+	}
-+
-+	BRASERO_BURN_LOG ("Format capacity %lli %lli",
-+			  priv->block_num,
-+			  priv->block_size);
-+
-+	g_free (hdr);
-+	return BRASERO_BURN_OK;
-+}
-+
-+static BraseroBurnResult
-+brasero_medium_get_capacity_by_type (BraseroMedium *self,
-+				     int fd,
-+				     BraseroScsiErrCode *code)
-+{
-+	BraseroMediumPrivate *priv;
-+
-+	priv = BRASERO_MEDIUM_PRIVATE (self);
-+
-+	priv->block_size = 2048;
-+
-+	if (!(priv->info & BRASERO_MEDIUM_REWRITABLE))
-+		return BRASERO_BURN_OK;
-+
-+	if (priv->info & BRASERO_MEDIUM_CD)
-+		brasero_medium_get_capacity_CD_RW (self, fd, code);
-+	else
-+		brasero_medium_get_capacity_DVD_RW (self, fd, code);
-+
-+	return BRASERO_BURN_OK;
-+}
-+
-+/**
-+ * Functions to retrieve the speed
-+ */
-+
-+static BraseroBurnResult
-+brasero_medium_get_speed_mmc3 (BraseroMedium *self,
-+			       int fd,
-+			       BraseroScsiErrCode *code)
-+{
-+	int size;
-+	int num_desc, i;
-+	gint max_rd, max_wrt;
-+	BraseroScsiResult result;
-+	BraseroMediumPrivate *priv;
-+	BraseroScsiWrtSpdDesc *desc;
-+	BraseroScsiGetPerfData *wrt_perf = NULL;
-+
-+	BRASERO_BURN_LOG ("Retrieving speed (Get Performance)");
-+
-+	/* NOTE: this only work if there is RT streaming feature with
-+	 * wspd bit set to 1. At least an MMC3 drive. */
-+	priv = BRASERO_MEDIUM_PRIVATE (self);
-+	result = brasero_mmc3_get_performance_wrt_spd_desc (fd,
-+							    &wrt_perf,
-+							    &size,
-+							    code);
-+
-+	if (result != BRASERO_SCSI_OK) {
-+		g_free (wrt_perf);
-+
-+		BRASERO_BURN_LOG ("GET PERFORMANCE failed");
-+		return BRASERO_BURN_ERR;
-+	}
-+
-+	num_desc = (size - sizeof (BraseroScsiGetPerfHdr)) /
-+		    sizeof (BraseroScsiWrtSpdDesc);
-+
-+	if (num_desc <=  0)
-+		goto end; 
-+
-+	priv->rd_speeds = g_new0 (gint, num_desc + 1);
-+	priv->wr_speeds = g_new0 (gint, num_desc + 1);
-+
-+	max_rd = 0;
-+	max_wrt = 0;
-+
-+	desc = (BraseroScsiWrtSpdDesc*) &wrt_perf->data;
-+	for (i = 0; i < num_desc; i ++, desc ++) {
-+		priv->rd_speeds [i] = BRASERO_GET_32 (desc->rd_speed);
-+		priv->wr_speeds [i] = BRASERO_GET_32 (desc->wr_speed);
-+
-+		max_rd = MAX (max_rd, priv->rd_speeds [i]);
-+		max_wrt = MAX (max_wrt, priv->wr_speeds [i]);
-+	}
-+
-+	priv->max_rd = max_rd;
-+	priv->max_wrt = max_wrt;
-+
-+end:
-+
-+	g_free (wrt_perf);
-+
-+	/* strangely there are so drives (I know one case) which support this
-+	 * function but don't report any speed. So if our top speed is 0 then
-+	 * use the other way to get the speed. It was a Teac */
-+	if (!priv->max_wrt)
-+		return BRASERO_BURN_ERR;
-+
-+	return BRASERO_BURN_OK;
-+}
-+
-+static BraseroBurnResult
-+brasero_medium_get_page_2A_write_speed_desc (BraseroMedium *self,
-+					     int fd,
-+					     BraseroScsiErrCode *code)
-+{
-+	BraseroScsiStatusPage *page_2A = NULL;
-+	BraseroScsiStatusWrSpdDesc *desc;
-+	BraseroScsiModeData *data = NULL;
-+	BraseroMediumPrivate *priv;
-+	BraseroScsiResult result;
-+	gint desc_num, i;
-+	gint max_wrt = 0;
-+	gint max_num;
-+	int size = 0;
-+
-+	BRASERO_BURN_LOG ("Retrieving speed (2A speeds)");
-+
-+	priv = BRASERO_MEDIUM_PRIVATE (self);
-+	result = brasero_spc1_mode_sense_get_page (fd,
-+						   BRASERO_SPC_PAGE_STATUS,
-+						   &data,
-+						   &size,
-+						   code);
-+	if (result != BRASERO_SCSI_OK) {
-+		g_free (data);
-+
-+		BRASERO_BURN_LOG ("MODE SENSE failed");
-+		return BRASERO_BURN_ERR;
-+	}
-+
-+	page_2A = (BraseroScsiStatusPage *) &data->page;
-+
-+	/* FIXME: the following is not necessarily true */
-+	if (size < sizeof (BraseroScsiStatusPage)) {
-+		g_free (data);
-+
-+		BRASERO_BURN_LOG ("wrong size in page");
-+		return BRASERO_BURN_ERR;
-+	}
-+
-+	desc_num = BRASERO_GET_16 (page_2A->wr_speed_desc_num);
-+	max_num = size -
-+		  sizeof (BraseroScsiStatusPage) -
-+		  sizeof (BraseroScsiModeHdr);
-+	max_num /= sizeof (BraseroScsiWrtSpdDesc);
-+
-+	if (max_num < 0)
-+		max_num = 0;
-+
-+	if (desc_num > max_num)
-+		desc_num = max_num;
-+
-+	priv->wr_speeds = g_new0 (gint, desc_num + 1);
-+	desc = page_2A->wr_spd_desc;
-+	for (i = 0; i < desc_num; i ++, desc ++) {
-+		priv->wr_speeds [i] = BRASERO_GET_16 (desc->speed);
-+		max_wrt = MAX (max_wrt, priv->wr_speeds [i]);
-+	}
-+
-+	if (!max_wrt)
-+		priv->max_wrt = BRASERO_GET_16 (page_2A->wr_max_speed);
-+	else
-+		priv->max_wrt = max_wrt;
-+
-+	priv->max_rd = BRASERO_GET_16 (page_2A->rd_max_speed);
-+	g_free (data);
-+
-+	return BRASERO_BURN_OK;
-+}
-+
-+static BraseroBurnResult
-+brasero_medium_get_page_2A_max_speed (BraseroMedium *self,
-+				      int fd,
-+				      BraseroScsiErrCode *code)
-+{
-+	BraseroScsiStatusPage *page_2A = NULL;
-+	BraseroScsiModeData *data = NULL;
-+	BraseroMediumPrivate *priv;
-+	BraseroScsiResult result;
-+	int size = 0;
-+
-+	BRASERO_BURN_LOG ("Retrieving speed (2A max)");
-+
-+	priv = BRASERO_MEDIUM_PRIVATE (self);
-+
-+	result = brasero_spc1_mode_sense_get_page (fd,
-+						   BRASERO_SPC_PAGE_STATUS,
-+						   &data,
-+						   &size,
-+						   code);
-+	if (result != BRASERO_SCSI_OK) {
-+		g_free (data);
-+
-+		BRASERO_BURN_LOG ("MODE SENSE failed");
-+		return BRASERO_BURN_ERR;
-+	}
-+
-+	page_2A = (BraseroScsiStatusPage *) &data->page;
-+
-+	if (size < 0x14) {
-+		g_free (data);
-+
-+		BRASERO_BURN_LOG ("wrong page size");
-+		return BRASERO_BURN_ERR;
-+	}
-+
-+	priv->max_rd = BRASERO_GET_16 (page_2A->rd_max_speed);
-+	priv->max_wrt = BRASERO_GET_16 (page_2A->wr_max_speed);
-+
-+	g_free (data);
-+	return BRASERO_BURN_OK;
-+}
-+
-+static BraseroBurnResult
-+brasero_medium_get_medium_type (BraseroMedium *self,
-+				int fd,
-+				BraseroScsiErrCode *code)
-+{
-+	BraseroScsiGetConfigHdr *hdr = NULL;
-+	BraseroMediumPrivate *priv;
-+	BraseroScsiResult result;
-+	int size;
-+
-+	BRASERO_BURN_LOG ("Retrieving media profile");
-+
-+	priv = BRASERO_MEDIUM_PRIVATE (self);
-+	result = brasero_mmc2_get_configuration_feature (fd,
-+							 BRASERO_SCSI_FEAT_REAL_TIME_STREAM,
-+							 &hdr,
-+							 &size,
-+							 code);
-+	if (result != BRASERO_SCSI_OK) {
-+		BraseroScsiAtipData *data = NULL;
-+		int size = 0;
-+
-+		BRASERO_BURN_LOG ("GET CONFIGURATION failed");
-+
-+		/* This could be a MMC1 drive since this command was
-+		 * introduced in MMC2 and is supported onward. So it
-+		 * has to be a CD (R/RW). The rest of the information
-+		 * will be provided by read_disc_information. */
-+
-+		/* The only thing here left to determine is if that's a WRITABLE
-+		 * or a REWRITABLE. To determine that information, we need to
-+		 * read TocPmaAtip. It if fails that's a ROM, if it succeeds.
-+		 * No need to set error code since we consider that it's a ROM
-+		 * if a failure happens. */
-+		result = brasero_mmc1_read_atip (fd,
-+						 &data,
-+						 &size,
-+						 NULL);
-+		if (result != BRASERO_SCSI_OK) {
-+			/* CDROM */
-+			priv->info = BRASERO_MEDIUM_CDROM;
-+			priv->type = types [1];
-+			priv->icon = icons [1];
-+		}
-+		else {
-+			/* check the size of the structure: it must be at least 8 bytes long */
-+			if (size < 8) {
-+				if (size)
-+					g_free (data);
-+
-+				BRASERO_BURN_LOG ("READ ATIP failed (wrong size)");
-+				return BRASERO_BURN_ERR;
-+			}
-+
-+			if (data->desc->erasable) {
-+				/* CDRW */
-+				priv->info = BRASERO_MEDIUM_CDRW;
-+				priv->type = types [3];
-+				priv->icon = icons [3];
-+			}
-+			else {
-+				/* CDR */
-+				priv->info = BRASERO_MEDIUM_CDR;
-+				priv->type = types [2];
-+				priv->icon = icons [2];
-+			}
-+
-+			g_free (data);
-+		}
-+
-+		/* retrieve the speed */
-+		result = brasero_medium_get_page_2A_max_speed (self,
-+							       fd,
-+							       code);
-+		return result;
-+	}
-+
-+	switch (BRASERO_GET_16 (hdr->current_profile)) {
-+	case BRASERO_SCSI_PROF_CDROM:
-+		priv->info = BRASERO_MEDIUM_CDROM;
-+		priv->type = types [1];
-+		priv->icon = icons [1];
-+		break;
-+
-+	case BRASERO_SCSI_PROF_CDR:
-+		priv->info = BRASERO_MEDIUM_CDR;
-+		priv->type = types [2];
-+		priv->icon = icons [2];
-+		break;
-+
-+	case BRASERO_SCSI_PROF_CDRW:
-+		priv->info = BRASERO_MEDIUM_CDRW;
-+		priv->type = types [3];
-+		priv->icon = icons [3];
-+		break;
-+
-+	case BRASERO_SCSI_PROF_DVD_ROM:
-+		priv->info = BRASERO_MEDIUM_DVD_ROM;
-+		priv->type = types [4];
-+		priv->icon = icons [4];
-+		break;
-+
-+	case BRASERO_SCSI_PROF_DVD_R:
-+		priv->info = BRASERO_MEDIUM_DVDR;
-+		priv->type = types [5];
-+		priv->icon = icons [5];
-+		break;
-+
-+	case BRASERO_SCSI_PROF_DVD_RW_RESTRICTED:
-+		priv->info = BRASERO_MEDIUM_DVDRW_RESTRICTED;
-+		priv->type = types [6];
-+		priv->icon = icons [6];
-+		break;
-+
-+	case BRASERO_SCSI_PROF_DVD_RW_SEQUENTIAL:
-+		priv->info = BRASERO_MEDIUM_DVDRW;
-+		priv->type = types [6];
-+		priv->icon = icons [6];
-+		break;
-+
-+	case BRASERO_SCSI_PROF_DVD_R_PLUS:
-+		priv->info = BRASERO_MEDIUM_DVDR_PLUS;
-+		priv->type = types [7];
-+		priv->icon = icons [7];
-+		break;
-+
-+	case BRASERO_SCSI_PROF_DVD_RW_PLUS:
-+		priv->info = BRASERO_MEDIUM_DVDRW_PLUS;
-+		priv->type = types [8];
-+		priv->icon = icons [7];
-+		break;
-+
-+	/* WARNING: these types are recognized, no more */
-+	case BRASERO_SCSI_PROF_DVD_R_PLUS_DL:
-+		priv->info = BRASERO_MEDIUM_DVDR_PLUS_DL;
-+		priv->type = types [9];
-+		priv->icon = icons [7];
-+		break;
-+
-+	case BRASERO_SCSI_PROF_DVD_RW_PLUS_DL:
-+		priv->info = BRASERO_MEDIUM_DVDRW_PLUS_DL;
-+		priv->type = types [10];
-+		priv->icon = icons [7];
-+		break;
-+
-+	case BRASERO_SCSI_PROF_DVD_R_DL_SEQUENTIAL:
-+		priv->info = BRASERO_MEDIUM_DVDR_DL;
-+		priv->type = types [11];
-+		priv->icon = icons [5];
-+		break;
-+
-+	case BRASERO_SCSI_PROF_DVD_R_DL_JUMP:
-+		priv->info = BRASERO_MEDIUM_DVDR_JUMP_DL;
-+		priv->type = types [11];
-+		priv->icon = icons [5];
-+		break;
-+
-+	case BRASERO_SCSI_PROF_DVD_RAM:
-+		priv->info = BRASERO_MEDIUM_DVD_RAM;
-+		priv->type = types [12];
-+		priv->icon = icons [8];
-+		break;
-+
-+	case BRASERO_SCSI_PROF_BD_ROM:
-+		priv->info = BRASERO_MEDIUM_BD_ROM;
-+		priv->type = types [13];
-+		priv->icon = icons [4];
-+		break;
-+
-+	case BRASERO_SCSI_PROF_BR_R_SEQUENTIAL:
-+		priv->info = BRASERO_MEDIUM_BDR;
-+		priv->type = types [14];
-+		priv->icon = icons [5];
-+		break;
-+
-+	case BRASERO_SCSI_PROF_BR_R_RANDOM:
-+		priv->info = BRASERO_MEDIUM_BDR_RANDOM;
-+		priv->type = types [14];
-+		priv->icon = icons [5];
-+		break;
-+
-+	case BRASERO_SCSI_PROF_BD_RW:
-+		priv->info = BRASERO_MEDIUM_BDRW;
-+		priv->type = types [15];
-+		priv->icon = icons [6];
-+		break;
-+
-+	case BRASERO_SCSI_PROF_NON_REMOVABLE:
-+	case BRASERO_SCSI_PROF_REMOVABLE:
-+	case BRASERO_SCSI_PROF_MO_ERASABLE:
-+	case BRASERO_SCSI_PROF_MO_WRITE_ONCE:
-+	case BRASERO_SCSI_PROF_MO_ADVANCED_STORAGE:
-+	case BRASERO_SCSI_PROF_DDCD_ROM:
-+	case BRASERO_SCSI_PROF_DDCD_R:
-+	case BRASERO_SCSI_PROF_DDCD_RW:
-+	case BRASERO_SCSI_PROF_HD_DVD_ROM:
-+	case BRASERO_SCSI_PROF_HD_DVD_R:
-+	case BRASERO_SCSI_PROF_HD_DVD_RAM:
-+		priv->info = BRASERO_MEDIUM_UNSUPPORTED;
-+		priv->icon = icons [0];
-+		g_free (hdr);
-+		return BRASERO_BURN_NOT_SUPPORTED;
-+	}
-+
-+	/* try all SCSI functions to get write/read speeds in order */
-+	if (hdr->desc->add_len >= sizeof (BraseroScsiRTStreamDesc)) {
-+		BraseroScsiRTStreamDesc *stream;
-+
-+		/* means it's at least an MMC3 drive */
-+		stream = (BraseroScsiRTStreamDesc *) hdr->desc->data;
-+		if (stream->wrt_spd) {
-+			result = brasero_medium_get_speed_mmc3 (self, fd, code);
-+			if (result == BRASERO_BURN_OK)
-+				goto end;
-+		}
-+
-+		if (stream->mp2a) {
-+			result = brasero_medium_get_page_2A_write_speed_desc (self, fd, code);
-+			if (result == BRASERO_BURN_OK)
-+				goto end;
-+		}
-+	}
-+
-+	/* fallback for speeds */
-+	result = brasero_medium_get_page_2A_max_speed (self, fd, code);
-+
-+end:
-+
-+	g_free (hdr);
-+
-+	if (result != BRASERO_BURN_OK)
-+		return result;
-+
-+	return BRASERO_BURN_OK;
-+}
-+
-+static BraseroBurnResult
-+brasero_medium_get_css_feature (BraseroMedium *self,
-+				int fd,
-+				BraseroScsiErrCode *code)
-+{
-+	BraseroScsiGetConfigHdr *hdr = NULL;
-+	BraseroMediumPrivate *priv;
-+	BraseroScsiResult result;
-+	int size;
-+
-+	priv = BRASERO_MEDIUM_PRIVATE (self);
-+
-+	BRASERO_BURN_LOG ("Testing for Css encrypted media");
-+	result = brasero_mmc2_get_configuration_feature (fd,
-+							 BRASERO_SCSI_FEAT_DVD_CSS,
-+							 &hdr,
-+							 &size,
-+							 code);
-+	if (result != BRASERO_SCSI_OK) {
-+		g_free (hdr);
-+
-+		BRASERO_BURN_LOG ("GET CONFIGURATION failed");
-+		return BRASERO_BURN_ERR;
-+	}
-+
-+	if (hdr->desc->add_len < sizeof (BraseroScsiDVDCssDesc)) {
-+		g_free (hdr);
-+		return BRASERO_BURN_OK;
-+	}
-+
-+	/* here we just need to see if this feature is current or not */
-+	if (hdr->desc->current) {
-+		priv->info |= BRASERO_MEDIUM_PROTECTED;
-+		BRASERO_BURN_LOG ("media is Css protected");
-+	}
-+
-+	g_free (hdr);
-+	return BRASERO_BURN_OK;
-+}
-+
-+/**
-+ * Functions to get information about disc contents
-+ */
-+
-+static void
-+brasero_medium_set_track_type (BraseroMedium *self,
-+			       BraseroMediumTrack *track,
-+			       guchar control)
-+{
-+	BraseroMediumPrivate *priv;
-+
-+	priv = BRASERO_MEDIUM_PRIVATE (self);
-+
-+	if (control & BRASERO_SCSI_TRACK_COPY)
-+		track->type |= BRASERO_MEDIUM_TRACK_COPY;
-+
-+	if (!(control & BRASERO_SCSI_TRACK_DATA)) {
-+		track->type |= BRASERO_MEDIUM_TRACK_AUDIO;
-+		priv->info |= BRASERO_MEDIUM_HAS_AUDIO;
-+
-+		if (control & BRASERO_SCSI_TRACK_PREEMP)
-+			track->type |= BRASERO_MEDIUM_TRACK_PREEMP;
-+
-+		if (control & BRASERO_SCSI_TRACK_4_CHANNELS)
-+			track->type |= BRASERO_MEDIUM_TRACK_4_CHANNELS;
-+	}
-+	else {
-+		track->type |= BRASERO_MEDIUM_TRACK_DATA;
-+		priv->info |= BRASERO_MEDIUM_HAS_DATA;
-+
-+		if (control & BRASERO_SCSI_TRACK_DATA_INCREMENTAL)
-+			track->type |= BRASERO_MEDIUM_TRACK_INCREMENTAL;
-+	}
-+}
-+
-+static BraseroBurnResult
-+brasero_medium_track_volume_size (BraseroMedium *self,
-+				  BraseroMediumTrack *track,
-+				  int fd)
-+{
-+	BraseroMediumPrivate *priv;
-+	BraseroBurnResult res;
-+	GError *error = NULL;
-+	gint64 nb_blocks;
-+
-+	if (!track)
-+		return BRASERO_BURN_ERR;
-+
-+	priv = BRASERO_MEDIUM_PRIVATE (self);
-+
-+	/* This is a special case. For DVD+RW and DVD-RW in restricted
-+	 * mode, there is only one session that takes the whole disc size
-+	 * once formatted. That doesn't necessarily means they have data
-+	 * Note also that they are reported as complete though you can
-+	 * still add data (with growisofs). It is nevertheless on the 
-+	 * condition that the fs is valid.
-+	 * So we check if their first and only volume is valid. 
-+	 * That's also used when the track size is reported a 300 Kio
-+	 * see below */
-+	res = brasero_volume_get_size_fd (fd,
-+					  track->start,
-+					  &nb_blocks,
-+					  NULL);
-+	if (!res) {
-+		BRASERO_BURN_LOG ("Failed to retrieve the volume size: %s",
-+				  error && error->message ? 
-+				  error->message:"unknown error");
-+
-+		if (error)
-+			g_error_free (error);
-+		return BRASERO_BURN_ERR;
-+	}
-+
-+	track->blocks_num = nb_blocks;
-+	return BRASERO_BURN_OK;
-+}
-+
-+static BraseroBurnResult
-+brasero_medium_track_get_info (BraseroMedium *self,
-+			       BraseroMediumTrack *track,
-+			       int track_num,
-+			       int fd,
-+			       BraseroScsiErrCode *code)
-+{
-+	BraseroScsiTrackInfo track_info;
-+	BraseroMediumPrivate *priv;
-+	BraseroScsiResult result;
-+	int size;
-+
-+	BRASERO_BURN_LOG ("Retrieving track information for %i", track_num);
-+
-+	priv = BRASERO_MEDIUM_PRIVATE (self);
-+
-+	/* at this point we know the type of the disc that's why we set the 
-+	 * size according to this type. That may help to avoid outrange address
-+	 * errors. */
-+	if (BRASERO_MEDIUM_IS (priv->info, BRASERO_MEDIUM_DL|BRASERO_MEDIUM_WRITABLE))
-+		size = 48;
-+	else if (BRASERO_MEDIUM_IS (priv->info, BRASERO_MEDIUM_PLUS|BRASERO_MEDIUM_WRITABLE))
-+		size = 40;
-+	else
-+		size = 36;
-+
-+	result = brasero_mmc1_read_track_info (fd,
-+					       track_num,
-+					       &track_info,
-+					       &size,
-+					       code);
-+
-+	if (result != BRASERO_SCSI_OK) {
-+		BRASERO_BURN_LOG ("READ TRACK INFO failed");
-+		return BRASERO_BURN_ERR;
-+	}
-+
-+	track->blocks_num = BRASERO_GET_32 (track_info.track_size);
-+	track->session = BRASERO_SCSI_SESSION_NUM (track_info);
-+
-+	/* Now here is a potential bug: we can write tracks (data or not)
-+	 * shorter than 300 Kio /2 sec but they will be padded to reach this
-+	 * floor value. That means that is blocks_num is 300 blocks that may
-+	 * mean that the data length on the track is actually shorter.
-+	 * So we read the volume descriptor. If it works, good otherwise
-+	 * use the old value.
-+	 * That's important for checksuming to have a perfect account of the 
-+	 * data size. */
-+	if (track->blocks_num <= 300) {
-+		BRASERO_BURN_LOG ("300 sectors size. Checking for real size");
-+		brasero_medium_track_volume_size (self, track, fd);
-+	}
-+
-+	if (track_info.next_wrt_address_valid)
-+		priv->next_wr_add = BRASERO_GET_32 (track_info.next_wrt_address);
-+
-+	BRASERO_BURN_LOG ("Track %i (session %i): type = %i start = %llu size = %llu",
-+			  track_num,
-+			  track->session,
-+			  track->type,
-+			  track->start,
-+			  track->blocks_num);
-+
-+	return BRASERO_BURN_OK;
-+}
-+
-+/**
-+ * return :
-+ *  0 when it's not possible to determine (fallback to formatted toc)
-+ * -1 for BCD
-+ *  1 for HEX */
-+static guint
-+brasero_medium_check_BCD_use (BraseroMedium *self,
-+			      int fd,
-+			      BraseroScsiRawTocDesc *desc,
-+			      guint num,
-+			      BraseroScsiErrCode *code)
-+{
-+	guint i;
-+	int size;
-+	guint leadout = 0;
-+	guint track_num = 0;
-+	gboolean use_BCD = TRUE;
-+	gboolean use_HEX = TRUE;
-+	BraseroScsiResult result;
-+	BraseroScsiTrackInfo track_info;
-+	guint start_BCD, start_LBA, track_start;
-+
-+	/* first check if all values are valid BCD numbers in the descriptors */
-+	for (i = 0; i < num; i++) {
-+		if (desc [i].adr == 1 && desc [i].point <= BRASERO_SCSI_Q_SUB_CHANNEL_TRACK_START) {
-+			if (!BRASERO_IS_BCD_VALID (desc [i].p_min)
-+			||  !BRASERO_IS_BCD_VALID (desc [i].p_sec)
-+			||  !BRASERO_IS_BCD_VALID (desc [i].p_frame)) {
-+				use_BCD = FALSE;
-+				break;
-+			}
-+		}
-+		else if (desc [i].point == BRASERO_SCSI_Q_SUB_CHANNEL_LEADOUT_START) {
-+			if (!BRASERO_IS_BCD_VALID (desc [i].p_min)
-+			||  !BRASERO_IS_BCD_VALID (desc [i].p_sec)
-+			||  !BRASERO_IS_BCD_VALID (desc [i].p_frame)) {
-+				use_BCD = FALSE;
-+				break;
-+			}
-+		}
-+	}
-+
-+	/* then check if there are valid Hex values */
-+	for (i = 0; i < num; i++) {
-+		if (desc [i].adr != 1 || desc [i].point > BRASERO_SCSI_Q_SUB_CHANNEL_TRACK_START)
-+			continue;
-+
-+		if (desc [i].p_min > 99
-+		||  desc [i].p_sec > 59
-+		||  desc [i].p_frame > 74) {
-+			use_HEX = FALSE;
-+			break;
-+		}
-+	}
-+
-+	if (use_BCD != use_HEX) {
-+		if (use_BCD)
-+			return -1;
-+
-+		return 1;
-+	}
-+
-+	/* To check if the drive uses BCD values or HEX values we ask for the 
-+	 * track information that contains also the start for the track but in
-+	 * HEX values. If values are the same then it works. */
-+
-+	/* NOTE: there could be another way to do it: get first track, in LBA
-+	 * and BCD it must be 150. */
-+
-+	/* First find the first track and get track start address in BCD */
-+	BRASERO_BURN_LOG ("Retrieving track information to determine number format");
-+
-+	for (i = 0; i < num; i++) {
-+		if (desc [i].adr == BRASERO_SCSI_Q_SUB_CHANNEL_LEADIN_MODE5
-+		&&  desc [i].point == BRASERO_SCSI_Q_SUB_CHANNEL_MULTI_NEXT_SESSION) {
-+			/* store the leadout number just in case */
-+			leadout = i;
-+			continue;
-+		}
-+
-+		if (desc [i].adr != 1 || desc [i].point > BRASERO_SCSI_Q_SUB_CHANNEL_TRACK_START)
-+			continue;
-+
-+		track_num ++;
-+
-+		start_BCD = BRASERO_MSF_TO_LBA (BRASERO_GET_BCD (desc [i].p_min),
-+						BRASERO_GET_BCD (desc [i].p_sec),
-+						BRASERO_GET_BCD (desc [i].p_frame));
-+
-+		start_LBA = BRASERO_MSF_TO_LBA (desc [i].p_min,
-+						desc [i].p_sec,
-+						desc [i].p_frame);
-+
-+		BRASERO_BURN_LOG ("Comparing to track information from READ TRACK INFO for track %i", track_num);
-+
-+		size = 36;
-+		start_LBA -= 150;
-+		start_BCD -= 150;
-+
-+		result = brasero_mmc1_read_track_info (fd,
-+						       track_num,
-+						       &track_info,
-+						       &size,
-+						       code);
-+
-+		if (result != BRASERO_SCSI_OK) {
-+			BRASERO_BURN_LOG ("READ TRACK INFO failed");
-+			/* Fallback to formatted toc */
-+			return 0;
-+		}
-+
-+		track_start = BRASERO_GET_32 (track_info.start_lba);
-+		BRASERO_BURN_LOG ("comparing DCB %i and LBA %i to real start address %i",
-+				  start_BCD, start_LBA, track_start);
-+
-+		/* try to find a conclusive match */
-+		if (track_start == start_BCD && track_start != start_LBA)
-+			return -1;
-+
-+		if (track_start == start_LBA && track_start != start_BCD)
-+			return 1;
-+	}
-+
-+	/* Our last chance, the leadout.
-+	 * NOTE: no need to remove 150 sectors here. */
-+	start_BCD = BRASERO_MSF_TO_LBA (BRASERO_GET_BCD (desc [leadout].min),
-+					BRASERO_GET_BCD (desc [leadout].sec),
-+					BRASERO_GET_BCD (desc [leadout].frame));
-+
-+	start_LBA = BRASERO_MSF_TO_LBA (desc [leadout].min,
-+					desc [leadout].sec,
-+					desc [leadout].frame);
-+
-+	BRASERO_BURN_LOG ("Comparing to track information from READ TRACK INFO for leadout");
-+
-+	size = 36;
-+
-+	/* leadout number is number of tracks + 1 */
-+	result = brasero_mmc1_read_track_info (fd,
-+					       track_num + 1,
-+					       &track_info,
-+					       &size,
-+					       code);
-+
-+	if (result != BRASERO_SCSI_OK) {
-+		BRASERO_BURN_LOG ("READ TRACK INFO failed for leadout");
-+		/* Fallback to formatted toc */
-+		return 0;
-+	}
-+
-+	track_start = BRASERO_GET_32 (track_info.start_lba);
-+	BRASERO_BURN_LOG ("comparing DCB %i and LBA %i to real start address %i",
-+			  start_BCD, start_LBA, track_start);
-+
-+	/* try to find a conclusive match */
-+	if (track_start == start_BCD && track_start != start_LBA)
-+		return -1;
-+
-+	if (track_start == start_LBA && track_start != start_BCD)
-+		return 1;
-+
-+	/* fallback to formatted toc */
-+	return 0;
-+}
-+
-+/**
-+ * The reason why we use this perhaps more lengthy method is that with
-+ * multisession discs, the first track is reported to be two sectors shorter
-+ * than it should. As I don't know why and since the following works we use
-+ * this one. */
-+static BraseroBurnResult
-+brasero_medium_get_CD_sessions_info (BraseroMedium *self,
-+				     int fd,
-+				     BraseroScsiErrCode *code)
-+{
-+	gint use_bcd;
-+	GSList *iter;
-+	int num, i, size;
-+	gint leadout_start = 0;
-+	BraseroScsiResult result;
-+	BraseroMediumPrivate *priv;
-+	BraseroScsiRawTocDesc *desc;
-+	BraseroScsiRawTocData *toc = NULL;
-+
-+	BRASERO_BURN_LOG ("Reading Raw Toc");
-+
-+	priv = BRASERO_MEDIUM_PRIVATE (self);
-+
-+	size = 0;
-+	result = brasero_mmc1_read_toc_raw (fd,
-+					    0,
-+					    &toc,
-+					    &size,
-+					    code);
-+	if (result != BRASERO_SCSI_OK) {
-+		BRASERO_BURN_LOG ("READ TOC failed");
-+		return BRASERO_BURN_ERR;
-+	}
-+
-+	num = (size - sizeof (BraseroScsiRawTocData)) /
-+	       sizeof (BraseroScsiRawTocDesc);
-+
-+	BRASERO_BURN_LOG ("%i track(s) found", num);
-+
-+	desc = toc->desc;
-+	use_bcd = brasero_medium_check_BCD_use (self, fd, desc, num, code);
-+	if (!use_bcd) {
-+		g_free (toc);
-+
-+		BRASERO_BURN_LOG ("Fallback to formatted toc");
-+		return BRASERO_BURN_ERR;
-+	}
-+
-+	if (use_bcd > 0)
-+		use_bcd = 0;
-+
-+	if (use_bcd) {
-+		BRASERO_BURN_LOG ("Using BCD format");
-+	}
-+	else {
-+		BRASERO_BURN_LOG ("Using HEX format");
-+	}
-+
-+	for (i = 0; i < num; i++, desc ++) {
-+		BraseroMediumTrack *track;
-+
-+		track = NULL;
-+		if (desc->adr == 1 && desc->point <= BRASERO_SCSI_Q_SUB_CHANNEL_TRACK_START) {
-+			track = g_new0 (BraseroMediumTrack, 1);
-+			track->session = desc->session_num;
-+
-+			brasero_medium_set_track_type (self, track, desc->control);
-+			if (use_bcd)
-+				track->start = BRASERO_MSF_TO_LBA (BRASERO_GET_BCD (desc->p_min),
-+								   BRASERO_GET_BCD (desc->p_sec),
-+								   BRASERO_GET_BCD (desc->p_frame));
-+			else
-+				track->start = BRASERO_MSF_TO_LBA (desc->p_min,
-+								   desc->p_sec,
-+								   desc->p_frame);
-+
-+			track->start -= 150;
-+
-+			/* if there are tracks and the last previously added track is in
-+			 * the same session then set the size */
-+			if (priv->tracks) {
-+				BraseroMediumTrack *last_track;
-+
-+				last_track = priv->tracks->data;
-+				if (last_track->session == track->session)
-+					last_track->blocks_num = track->start - last_track->start;
-+			}
-+
-+			priv->tracks = g_slist_prepend (priv->tracks, track);
-+		}
-+		else if (desc->point == BRASERO_SCSI_Q_SUB_CHANNEL_LEADOUT_START) {
-+			/* NOTE: the leadout session is first in the list. So if
-+			 * we have tracks in the list set the last session track
-+			 * size when we reach a new leadout (and therefore a new
-+			 * session). */
-+
-+			if (priv->tracks) {
-+				BraseroMediumTrack *last_track;
-+
-+				last_track = priv->tracks->data;
-+				last_track->blocks_num = leadout_start - last_track->start;
-+			}
-+
-+			if (use_bcd)
-+				leadout_start = BRASERO_MSF_TO_LBA (BRASERO_GET_BCD (desc->p_min),
-+								    BRASERO_GET_BCD (desc->p_sec),
-+								    BRASERO_GET_BCD (desc->p_frame));
-+			else
-+				leadout_start = BRASERO_MSF_TO_LBA (desc->p_min,
-+								    desc->p_sec,
-+								    desc->p_frame);
-+			leadout_start -= 150;
-+		}
-+	}
-+
-+	if (priv->tracks) {
-+		BraseroMediumTrack *last_track;
-+
-+		/* set the last found track size */
-+		last_track = priv->tracks->data;
-+		last_track->blocks_num = leadout_start - last_track->start;
-+	}
-+
-+	/* Add a leadout */
-+	if (!(priv->info & BRASERO_MEDIUM_CLOSED)) {
-+		BraseroMediumTrack *track;
-+
-+		/* we shouldn't request info on leadout if the disc is closed */
-+		track = g_new0 (BraseroMediumTrack, 1);
-+		priv->tracks = g_slist_prepend (priv->tracks, track);
-+		track->start = leadout_start;
-+		track->type = BRASERO_MEDIUM_TRACK_LEADOUT;
-+
-+		brasero_medium_track_get_info (self, track, g_slist_length (priv->tracks), fd, code); 
-+	}
-+
-+	priv->tracks = g_slist_reverse (priv->tracks);
-+
-+	for (iter = priv->tracks; iter; iter = iter->next) {
-+		BraseroMediumTrack *track;
-+
-+		track = iter->data;
-+
-+		/* check for tracks less that 300 sectors */
-+		if (track->blocks_num <= 300 && track->type != BRASERO_MEDIUM_TRACK_LEADOUT) {
-+			BRASERO_BURN_LOG ("300 sectors size. Checking for real size");
-+			brasero_medium_track_volume_size (self, track, fd);
-+		}
-+
-+		BRASERO_BURN_LOG ("Track %i: type = %i start = %llu size = %llu",
-+				  g_slist_index (priv->tracks, track),
-+				  track->type,
-+				  track->start,
-+				  track->blocks_num);
-+	}
-+
-+	g_free (toc);
-+	return BRASERO_BURN_OK;
-+}
-+
-+/**
-+ * NOTE: for DVD-R multisession we lose 28688 blocks for each session
-+ * so the capacity is the addition of all session sizes + 28688 for each
-+ * For all multisession DVD-/+R and CDR-RW the remaining size is given 
-+ * in the leadout. One exception though with DVD+/-RW.
-+ */
-+
-+static void
-+brasero_medium_add_DVD_plus_RW_leadout (BraseroMedium *self,
-+					gint32 start)
-+{
-+	BraseroMediumTrack *leadout;
-+	BraseroMediumPrivate *priv;
-+
-+	priv = BRASERO_MEDIUM_PRIVATE (self);
-+
-+	leadout = g_new0 (BraseroMediumTrack, 1);
-+	priv->tracks = g_slist_append (priv->tracks, leadout);
-+
-+	leadout->start = start;
-+	leadout->type = BRASERO_MEDIUM_TRACK_LEADOUT;
-+
-+	/* we fabricate the leadout here. We don't really need one in 
-+	 * fact since it is always at the last sector whatever the
-+	 * amount of data written. So we need in fact to read the file
-+	 * system and get the last sector from it. Hopefully it won't be
-+	 * buggy */
-+	priv->next_wr_add = 0;
-+
-+	leadout->blocks_num = priv->block_num;
-+	if (g_slist_length (priv->tracks) > 1) {
-+		BraseroMediumTrack *track;
-+
-+		track = priv->tracks->data;
-+		leadout->blocks_num -= ((track->blocks_num > 300) ? track->blocks_num : 300);
-+	}
-+	BRASERO_BURN_LOG ("Adding fabricated leadout start = %llu length = %llu",
-+			  leadout->start,
-+			  leadout->blocks_num);
-+}
-+
-+static BraseroBurnResult
-+brasero_medium_get_sessions_info (BraseroMedium *self,
-+				  int fd,
-+				  BraseroScsiErrCode *code)
-+{
-+	int num, i, size;
-+	BraseroScsiResult result;
-+	BraseroScsiTocDesc *desc;
-+	BraseroMediumPrivate *priv;
-+	BraseroScsiFormattedTocData *toc = NULL;
-+
-+	BRASERO_BURN_LOG ("Reading Toc");
-+
-+	priv = BRASERO_MEDIUM_PRIVATE (self);
-+	result = brasero_mmc1_read_toc_formatted (fd,
-+						  0,
-+						  &toc,
-+						  &size,
-+						  code);
-+	if (result != BRASERO_SCSI_OK) {
-+		g_free (toc);
-+
-+		BRASERO_BURN_LOG ("READ TOC failed");
-+		return BRASERO_BURN_ERR;
-+	}
-+
-+	num = (size - sizeof (BraseroScsiFormattedTocData)) /
-+	       sizeof (BraseroScsiTocDesc);
-+
-+	BRASERO_BURN_LOG ("%i track(s) found", num);
-+
-+	desc = toc->desc;
-+	for (i = 0; i < num; i ++, desc ++) {
-+		BraseroMediumTrack *track;
-+
-+		if (desc->track_num == BRASERO_SCSI_TRACK_LEADOUT_START)
-+			break;
-+
-+		track = g_new0 (BraseroMediumTrack, 1);
-+		priv->tracks = g_slist_prepend (priv->tracks, track);
-+		track->start = BRASERO_GET_32 (desc->track_start);
-+
-+		/* we shouldn't request info on a track if the disc is closed */
-+		brasero_medium_track_get_info (self,
-+					       track,
-+					       g_slist_length (priv->tracks),
-+					       fd,
-+					       code);
-+
-+		if (desc->control & BRASERO_SCSI_TRACK_COPY)
-+			track->type |= BRASERO_MEDIUM_TRACK_COPY;
-+
-+		if (!(desc->control & BRASERO_SCSI_TRACK_DATA)) {
-+			track->type |= BRASERO_MEDIUM_TRACK_AUDIO;
-+			priv->info |= BRASERO_MEDIUM_HAS_AUDIO;
-+
-+			if (desc->control & BRASERO_SCSI_TRACK_PREEMP)
-+				track->type |= BRASERO_MEDIUM_TRACK_PREEMP;
-+
-+			if (desc->control & BRASERO_SCSI_TRACK_4_CHANNELS)
-+				track->type |= BRASERO_MEDIUM_TRACK_4_CHANNELS;
-+		}
-+		else if (BRASERO_MEDIUM_IS (priv->info, BRASERO_MEDIUM_DVDRW_PLUS)
-+		     ||  BRASERO_MEDIUM_IS (priv->info, BRASERO_MEDIUM_DVDRW_RESTRICTED)) {
-+			BraseroBurnResult result;
-+
-+			/* a special case for these two kinds of media (DVD+RW)
-+			 * which have only one track: the first. */
-+			result = brasero_medium_track_volume_size (self, 
-+								   track,
-+								   fd);
-+			if (result == BRASERO_BURN_OK) {
-+				track->type |= BRASERO_MEDIUM_TRACK_DATA;
-+				priv->info |= BRASERO_MEDIUM_HAS_DATA;
-+
-+				priv->next_wr_add = 0;
-+
-+				if (desc->control & BRASERO_SCSI_TRACK_DATA_INCREMENTAL)
-+					track->type |= BRASERO_MEDIUM_TRACK_INCREMENTAL;
-+			}
-+			else {
-+				priv->tracks = g_slist_remove (priv->tracks, track);
-+				g_free (track);
-+
-+				priv->info |= BRASERO_MEDIUM_BLANK;
-+				priv->info &= ~BRASERO_MEDIUM_CLOSED;
-+			}
-+		}
-+		else {
-+			track->type |= BRASERO_MEDIUM_TRACK_DATA;
-+			priv->info |= BRASERO_MEDIUM_HAS_DATA;
-+
-+			if (desc->control & BRASERO_SCSI_TRACK_DATA_INCREMENTAL)
-+				track->type |= BRASERO_MEDIUM_TRACK_INCREMENTAL;
-+		}
-+	}
-+
-+	/* put the tracks in the right order */
-+	priv->tracks = g_slist_reverse (priv->tracks);
-+
-+	if (BRASERO_MEDIUM_IS (priv->info, BRASERO_MEDIUM_DVDRW_PLUS)
-+	||  BRASERO_MEDIUM_IS (priv->info, BRASERO_MEDIUM_DVDRW_RESTRICTED))
-+		brasero_medium_add_DVD_plus_RW_leadout (self, BRASERO_GET_32 (desc->track_start));
-+	else if (!(priv->info & BRASERO_MEDIUM_CLOSED)) {
-+		BraseroMediumTrack *track;
-+
-+		/* we shouldn't request info on leadout if the disc is closed
-+		 * (except for DVD+/- (restricted) RW (see above) */
-+		track = g_new0 (BraseroMediumTrack, 1);
-+		priv->tracks = g_slist_append (priv->tracks, track);
-+		track->start = BRASERO_GET_32 (desc->track_start);
-+		track->type = BRASERO_MEDIUM_TRACK_LEADOUT;
-+
-+		brasero_medium_track_get_info (self,
-+					       track,
-+					       g_slist_length (priv->tracks),
-+					       fd,
-+					       code);
-+	}
-+
-+	g_free (toc);
-+
-+	return BRASERO_BURN_OK;
-+}
-+
-+static BraseroBurnResult
-+brasero_medium_get_contents (BraseroMedium *self,
-+			     int fd,
-+			     BraseroScsiErrCode *code)
-+{
-+	int size;
-+	BraseroScsiResult result;
-+	BraseroMediumPrivate *priv;
-+	BraseroScsiDiscInfoStd *info = NULL;
-+
-+	BRASERO_BURN_LOG ("Retrieving media status");
-+
-+	priv = BRASERO_MEDIUM_PRIVATE (self);
-+
-+	result = brasero_mmc1_read_disc_information_std (fd,
-+							 &info,
-+							 &size,
-+							 code);
-+	if (result != BRASERO_SCSI_OK) {
-+		g_free (info);
-+	
-+		BRASERO_BURN_LOG ("READ DISC INFORMATION failed");
-+		return BRASERO_BURN_ERR;
-+	}
-+
-+	if (info->erasable)
-+		priv->info |= BRASERO_MEDIUM_REWRITABLE;
-+
-+	if (info->status == BRASERO_SCSI_DISC_EMPTY) {
-+		BraseroMediumTrack *track;
-+
-+		BRASERO_BURN_LOG ("Empty media");
-+
-+		priv->info |= BRASERO_MEDIUM_BLANK;
-+		priv->block_size = 2048;
-+
-+		if (BRASERO_MEDIUM_IS (priv->info, BRASERO_MEDIUM_DVDRW_PLUS)
-+		||  BRASERO_MEDIUM_IS (priv->info, BRASERO_MEDIUM_DVDRW_RESTRICTED))
-+			brasero_medium_add_DVD_plus_RW_leadout (self, 0);
-+		else {
-+			track = g_new0 (BraseroMediumTrack, 1);
-+			track->start = 0;
-+			track->type = BRASERO_MEDIUM_TRACK_LEADOUT;
-+			priv->tracks = g_slist_prepend (priv->tracks, track);
-+			
-+			brasero_medium_track_get_info (self,
-+						       track,
-+						       1,
-+						       fd,
-+						       code);
-+		}
-+		goto end;
-+	}
-+
-+	if (info->status == BRASERO_SCSI_DISC_INCOMPLETE) {
-+		priv->info |= BRASERO_MEDIUM_APPENDABLE;
-+		BRASERO_BURN_LOG ("Appendable media");
-+	}
-+	else if (info->status == BRASERO_SCSI_DISC_FINALIZED) {
-+		priv->info |= BRASERO_MEDIUM_CLOSED;
-+		BRASERO_BURN_LOG ("Closed media");
-+	}
-+
-+	if (priv->info & BRASERO_MEDIUM_CD) {
-+		result = brasero_medium_get_CD_sessions_info (self, fd, code);
-+		if (result != BRASERO_BURN_OK)
-+			result = brasero_medium_get_sessions_info (self, fd, code);
-+	}
-+	else
-+		result = brasero_medium_get_sessions_info (self, fd, code);
-+
-+	if (result != BRASERO_BURN_OK)
-+		goto end;
-+
-+end:
-+
-+	g_free (info);
-+	return BRASERO_BURN_OK;
-+}
-+
-+static void
-+brasero_medium_init_real (BraseroMedium *object, int fd)
-+{
-+	gchar *name;
-+	BraseroBurnResult result;
-+	BraseroMediumPrivate *priv;
-+	BraseroScsiErrCode code = 0;
-+
-+	priv = BRASERO_MEDIUM_PRIVATE (object);
-+
-+	name = nautilus_burn_drive_get_name_for_display (priv->drive);
-+	BRASERO_BURN_LOG ("Initializing information for medium in %s", name);
-+	g_free (name);
-+
-+	result = brasero_medium_get_medium_type (object, fd, &code);
-+	if (result != BRASERO_BURN_OK)
-+		return;
-+
-+	brasero_medium_get_capacity_by_type (object, fd, &code);
-+
-+	result = brasero_medium_get_contents (object, fd, &code);
-+	if (result != BRASERO_BURN_OK)
-+		return;
-+
-+	/* assume that css feature is only for DVD-ROM which might be wrong but
-+	 * some drives wrongly reports that css is enabled for blank DVD+R/W */
-+	if (BRASERO_MEDIUM_IS (priv->info, (BRASERO_MEDIUM_DVD|BRASERO_MEDIUM_ROM)))
-+		brasero_medium_get_css_feature (object, fd, &code);
-+
-+	BRASERO_BURN_LOG_DISC_TYPE (priv->info, "media is ");
-+}
-+
-+static gboolean
-+brasero_medium_retry_open (gpointer object)
-+{
-+	int fd;
-+	const gchar *path;
-+	BraseroMedium *self;
-+	BraseroMediumPrivate *priv;
-+
-+	self = BRASERO_MEDIUM (object);
-+	priv = BRASERO_MEDIUM_PRIVATE (object);
-+	path = nautilus_burn_drive_get_device (priv->drive);
-+
-+	BRASERO_BURN_LOG ("Retrying to open device %s", path);
-+	fd = open (path, OPEN_FLAGS);
-+	if (fd < 0) {
-+		if (errno == EBUSY
-+		||  errno == EAGAIN
-+		||  errno == EWOULDBLOCK) {
-+			BRASERO_BURN_LOG ("Device busy");
-+			/* we'll retry in a second */
-+			return TRUE;
-+		}
-+
-+		BRASERO_BURN_LOG ("Open () failed");
-+		priv->info = BRASERO_MEDIUM_UNSUPPORTED;
-+		priv->retry_id = 0;
-+		return FALSE;
-+	}
-+
-+	BRASERO_BURN_LOG ("Open () succeeded\n");
-+	priv->info = BRASERO_MEDIUM_NONE;
-+	priv->icon = icons [0];
-+
-+	priv->retry_id = 0;
-+
-+	brasero_medium_init_real (self, fd);
-+	close (fd);
-+
-+	return FALSE;
-+}
-+
-+static void
-+brasero_medium_try_open (BraseroMedium *self)
-+{
-+	int fd;
-+	const gchar *path;
-+	BraseroMediumPrivate *priv;
-+
-+	priv = BRASERO_MEDIUM_PRIVATE (self);
-+	path = nautilus_burn_drive_get_device (priv->drive);
-+
-+	/* the drive might be busy (a burning is going on) so we don't block
-+	 * but we re-try to open it every second */
-+	BRASERO_BURN_LOG ("Trying to open device %s", path);
-+	fd = open (path, OPEN_FLAGS);
-+	if (fd < 0) {
-+		if (errno == EAGAIN
-+		||  errno == EWOULDBLOCK
-+		||  errno == EBUSY) {
-+			BRASERO_BURN_LOG ("Device busy");
-+			priv->info = BRASERO_MEDIUM_BUSY;
-+			priv->icon = icons [0];
-+
-+			priv->retry_id = g_timeout_add (BUSY_RETRY_TIME,
-+							brasero_medium_retry_open,
-+							self);
-+		}
-+
-+		BRASERO_BURN_LOG ("Open () failed");
-+		return;
-+	}
-+
-+	BRASERO_BURN_LOG ("Open () succeeded");
-+	brasero_medium_init_real (self, fd);
-+	close (fd);
-+}
-+
-+static void
-+brasero_medium_init (BraseroMedium *object)
-+{
-+	BraseroMediumPrivate *priv;
-+
-+	priv = BRASERO_MEDIUM_PRIVATE (object);
-+	priv->next_wr_add = -1;
-+
-+	/* we can't do anything here since properties haven't been set yet */
-+}
-+
-+static void
-+brasero_medium_finalize (GObject *object)
-+{
-+	BraseroMediumPrivate *priv;
-+
-+	priv = BRASERO_MEDIUM_PRIVATE (object);
-+
-+	if (priv->retry_id) {
-+		g_source_remove (priv->retry_id);
-+		priv->retry_id = 0;
-+	}
-+
-+	g_free (priv->rd_speeds);
-+	priv->rd_speeds = NULL;
-+
-+	g_free (priv->wr_speeds);
-+	priv->wr_speeds = NULL;
-+
-+	g_slist_foreach (priv->tracks, (GFunc) g_free, NULL);
-+	g_slist_free (priv->tracks);
-+	priv->tracks = NULL;
-+
-+	nautilus_burn_drive_unref (priv->drive);
-+	priv->drive = NULL;
-+
-+	G_OBJECT_CLASS (parent_class)->finalize (object);
-+}
-+
-+static void
-+brasero_medium_set_property (GObject *object, guint prop_id, const GValue *value, GParamSpec *pspec)
-+{
-+	BraseroMediumPrivate *priv;
-+
-+	g_return_if_fail (BRASERO_IS_MEDIUM (object));
-+
-+	priv = BRASERO_MEDIUM_PRIVATE (object);
-+
-+	switch (prop_id)
-+	{
-+	case PROP_DRIVE:
-+		priv->drive = g_value_get_object (value);
-+		nautilus_burn_drive_ref (priv->drive);
-+		brasero_medium_try_open (BRASERO_MEDIUM (object));
-+		break;
-+	default:
-+		G_OBJECT_WARN_INVALID_PROPERTY_ID (object, prop_id, pspec);
-+		break;
-+	}
-+}
-+
-+static void
-+brasero_medium_get_property (GObject *object, guint prop_id, GValue *value, GParamSpec *pspec)
-+{
-+	BraseroMediumPrivate *priv;
-+
-+	g_return_if_fail (BRASERO_IS_MEDIUM (object));
-+
-+	priv = BRASERO_MEDIUM_PRIVATE (object);
-+
-+	switch (prop_id)
-+	{
-+	case PROP_DRIVE:
-+		nautilus_burn_drive_ref (priv->drive);
-+		g_value_set_object (value, priv->drive);
-+		break;
-+	default:
-+		G_OBJECT_WARN_INVALID_PROPERTY_ID (object, prop_id, pspec);
-+		break;
-+	}
-+}
-+
-+static void
-+brasero_medium_class_init (BraseroMediumClass *klass)
-+{
-+	GObjectClass* object_class = G_OBJECT_CLASS (klass);
-+	parent_class = G_OBJECT_CLASS (g_type_class_peek_parent (klass));
-+
-+	g_type_class_add_private (klass, sizeof (BraseroMediumPrivate));
-+
-+	object_class->finalize = brasero_medium_finalize;
-+	object_class->set_property = brasero_medium_set_property;
-+	object_class->get_property = brasero_medium_get_property;
-+
-+	g_object_class_install_property (object_class,
-+	                                 PROP_DRIVE,
-+	                                 g_param_spec_object ("drive",
-+	                                                      "drive",
-+	                                                      "drive in which medium is inserted",
-+	                                                      NAUTILUS_BURN_TYPE_DRIVE,
-+	                                                      G_PARAM_READWRITE | G_PARAM_CONSTRUCT_ONLY));
-+}
-+
-+GType
-+brasero_medium_get_type (void)
-+{
-+	static GType our_type = 0;
-+
-+	if (our_type == 0)
-+	{
-+		static const GTypeInfo our_info =
-+		{
-+			sizeof (BraseroMediumClass), /* class_size */
-+			(GBaseInitFunc) NULL, /* base_init */
-+			(GBaseFinalizeFunc) NULL, /* base_finalize */
-+			(GClassInitFunc) brasero_medium_class_init, /* class_init */
-+			(GClassFinalizeFunc) NULL, /* class_finalize */
-+			NULL /* class_data */,
-+			sizeof (BraseroMedium), /* instance_size */
-+			0, /* n_preallocs */
-+			(GInstanceInitFunc) brasero_medium_init, /* instance_init */
-+			NULL /* value_table */
-+		};
-+
-+		our_type = g_type_register_static (G_TYPE_OBJECT, "BraseroMedium",
-+		                                   &our_info, 0);
-+	}
-+
-+	return our_type;
-+}
-+
-+BraseroMedium *
-+brasero_medium_new (NautilusBurnDrive *drive)
-+{
-+	g_return_val_if_fail (drive != NULL, NULL);
-+	return BRASERO_MEDIUM (g_object_new (BRASERO_TYPE_MEDIUM,
-+					     "drive", drive,
-+					     NULL));
-+}
diff --git a/sysutils/brasero/files/patch-src_burn-medium.c b/sysutils/brasero/files/patch-src_burn-medium.c
deleted file mode 100644
index accb659e2..000000000
--- a/sysutils/brasero/files/patch-src_burn-medium.c
+++ /dev/null
@@ -1,2073 +0,0 @@
---- src/burn-medium.c.orig	2008-01-27 10:25:14.000000000 -0500
-+++ src/burn-medium.c	2008-02-06 01:55:21.000000000 -0500
-@@ -1,2070 +0,0 @@
--/* -*- Mode: C; indent-tabs-mode: t; c-basic-offset: 8; tab-width: 8 -*- */
--/*
-- * brasero
-- * Copyright (C) Philippe Rouquier 2007 <bonfire-app@wanadoo.fr>
-- * 
-- * brasero is free software.
-- * 
-- * You may redistribute it and/or modify it under the terms of the
-- * GNU General Public License, as published by the Free Software
-- * Foundation; either version 2 of the License, or (at your option)
-- * any later version.
-- * 
-- * brasero is distributed in the hope that it will be useful,
-- * but WITHOUT ANY WARRANTY; without even the implied warranty of
-- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
-- * See the GNU General Public License for more details.
-- * 
-- * You should have received a copy of the GNU General Public License
-- * along with brasero.  If not, write to:
-- * 	The Free Software Foundation, Inc.,
-- * 	51 Franklin Street, Fifth Floor
-- * 	Boston, MA  02110-1301, USA.
-- */
--
--#ifdef HAVE_CONFIG_H
--#  include <config.h>
--#endif
--
--#include <sys/types.h>
--#include <sys/stat.h>
--#include <fcntl.h>
--#include <errno.h>
--
--#include <glib.h>
--#include <glib/gi18n-lib.h>
--
--#include <nautilus-burn-drive.h>
--
--#include "burn-basics.h"
--#include "burn-debug.h"
--#include "burn-medium.h"
--#include "scsi-mmc1.h"
--#include "scsi-mmc2.h"
--#include "scsi-mmc3.h"
--#include "scsi-spc1.h"
--#include "scsi-utils.h"
--#include "scsi-mode-pages.h"
--#include "scsi-status-page.h"
--#include "scsi-q-subchannel.h"
--#include "scsi-dvd-structures.h"
--#include "burn-volume.h"
--#include "brasero-ncb.h"
--
--const gchar *icons [] = { 	"gnome-dev-removable",
--				"gnome-dev-cdrom",
--				"gnome-dev-disc-cdr",
--				"gnome-dev-disc-cdrw",
--				"gnome-dev-disc-dvdrom",
--				"gnome-dev-disc-dvdr",
--				"gnome-dev-disc-dvdrw",
--				"gnome-dev-disc-dvdr-plus",
--				"gnome-dev-disc-dvdram",
--				NULL };
--const gchar *types [] = {	N_("file"),
--				N_("CDROM"),
--				N_("CD-R"),
--				N_("CD-RW"),
--				N_("DVDROM"),
--				N_("DVD-R"),
--				N_("DVD-RW"),
--				N_("DVD+R"),
--				N_("DVD+RW"),
--				N_("DVD+R dual layer"),
--				N_("DVD+RW dual layer"),
--				N_("DVD-R dual layer"),
--				N_("DVD-RAM"),
--				N_("Blu-ray disc"),
--				N_("Writable Blu-ray disc"),
--				N_("Rewritable Blu-ray disc"),
--				NULL };
--
--
--typedef struct _BraseroMediumPrivate BraseroMediumPrivate;
--struct _BraseroMediumPrivate
--{
--	gint retry_id;
--
--	GSList * tracks;
--
--	const gchar *type;
--	const gchar *icon;
--
--	gint max_rd;
--	gint max_wrt;
--
--	gint *rd_speeds;
--	gint *wr_speeds;
--
--	gint64 block_num;
--	gint64 block_size;
--
--	guint64 next_wr_add;
--	BraseroMedia info;
--	NautilusBurnDrive * drive;
--};
--
--#define BRASERO_MEDIUM_PRIVATE(o)  (G_TYPE_INSTANCE_GET_PRIVATE ((o), BRASERO_TYPE_MEDIUM, BraseroMediumPrivate))
--
--/**
-- * Try to open the drive exclusively but don't block; if drive can't be opened
-- * exclusively then retry every second until we're shut or the drive state
-- * changes to not busy.
-- * No exclusive at the moment since when the medium is mounted we can't use excl
-- */
--
--#define OPEN_FLAGS			O_RDONLY /*|O_EXCL */|O_NONBLOCK
--#define BUSY_RETRY_TIME			1000
--
--enum
--{
--	PROP_0,
--	PROP_DRIVE
--};
--
--static GObjectClass* parent_class = NULL;
--
--const gchar *
--brasero_medium_get_type_string (BraseroMedium *medium)
--{
--	BraseroMediumPrivate *priv;
--
--	priv = BRASERO_MEDIUM_PRIVATE (medium);
--	return priv->type;
--}
--
--const gchar *
--brasero_medium_get_icon (BraseroMedium *medium)
--{
--	BraseroMediumPrivate *priv;
--
--	priv = BRASERO_MEDIUM_PRIVATE (medium);
--	return priv->icon;
--}
--
--BraseroMedia
--brasero_medium_get_status (BraseroMedium *medium)
--{
--	BraseroMediumPrivate *priv;
--
--	priv = BRASERO_MEDIUM_PRIVATE (medium);
--	return priv->info;
--}
--
--GSList *
--brasero_medium_get_tracks (BraseroMedium *medium)
--{
--	BraseroMediumPrivate *priv;
--
--	priv = BRASERO_MEDIUM_PRIVATE (medium);
--	return g_slist_copy (priv->tracks);
--}
--
--gboolean
--brasero_medium_get_last_data_track_address (BraseroMedium *medium,
--					    gint64 *byte,
--					    gint64 *sector)
--{
--	GSList *iter;
--	BraseroMediumPrivate *priv;
--	BraseroMediumTrack *track = NULL;
--
--	priv = BRASERO_MEDIUM_PRIVATE (medium);
--
--	for (iter = priv->tracks; iter; iter = iter->next) {
--		BraseroMediumTrack *current;
--
--		current = iter->data;
--		if (current->type & BRASERO_MEDIUM_TRACK_DATA)
--			track = current;
--	}
--
--	if (!track) {
--		if (byte)
--			*byte = -1;
--		if (sector)
--			*sector = -1;
--		return FALSE;
--	}
--
--	if (byte)
--		*byte = track->start * priv->block_size;
--
--	if (sector)
--		*sector = track->start;
--
--	return TRUE;
--}
--
--gboolean
--brasero_medium_get_last_data_track_space (BraseroMedium *medium,
--					  gint64 *size,
--					  gint64 *blocks)
--{
--	GSList *iter;
--	BraseroMediumPrivate *priv;
--	BraseroMediumTrack *track = NULL;
--
--	priv = BRASERO_MEDIUM_PRIVATE (medium);
--
--	for (iter = priv->tracks; iter; iter = iter->next) {
--		BraseroMediumTrack *current;
--
--		current = iter->data;
--		if (current->type & BRASERO_MEDIUM_TRACK_DATA)
--			track = current;
--	}
--
--	if (!track) {
--		if (size)
--			*size = -1;
--		if (blocks)
--			*blocks = -1;
--		return FALSE;
--	}
--
--	if (size)
--		*size = track->blocks_num * priv->block_size;
--	if (blocks)
--		*blocks = track->blocks_num;
--
--	return TRUE;
--}
--
--guint
--brasero_medium_get_track_num (BraseroMedium *medium)
--{
--	guint retval = 0;
--	GSList *iter;
--	BraseroMediumPrivate *priv;
--
--	priv = BRASERO_MEDIUM_PRIVATE (medium);
--	for (iter = priv->tracks; iter; iter = iter->next) {
--		BraseroMediumTrack *current;
--
--		current = iter->data;
--		if (current->type & BRASERO_MEDIUM_TRACK_LEADOUT)
--			break;
--
--		retval ++;
--	}
--
--	return retval;
--}
--
--static BraseroMediumTrack *
--brasero_medium_get_track (BraseroMedium *medium,
--			  guint num)
--{
--	guint i = 1;
--	GSList *iter;
--	BraseroMediumPrivate *priv;
--
--	priv = BRASERO_MEDIUM_PRIVATE (medium);
--
--	for (iter = priv->tracks; iter; iter = iter->next) {
--		BraseroMediumTrack *current;
--
--		current = iter->data;
--		if (current->type == BRASERO_MEDIUM_TRACK_LEADOUT)
--			break;
--
--		if (i == num)
--			return current;
--
--		i++;
--	}
--
--	return NULL;
--}
--
--gboolean
--brasero_medium_get_track_space (BraseroMedium *medium,
--				guint num,
--				gint64 *size,
--				gint64 *blocks)
--{
--	BraseroMediumPrivate *priv;
--	BraseroMediumTrack *track;
--
--	priv = BRASERO_MEDIUM_PRIVATE (medium);
--
--	track = brasero_medium_get_track (medium, num);
--	if (!track) {
--		if (size)
--			*size = -1;
--		if (blocks)
--			*blocks = -1;
--		return FALSE;
--	}
--
--	if (size)
--		*size = track->blocks_num * priv->block_size;
--	if (blocks)
--		*blocks = track->blocks_num;
--
--	return TRUE;
--}
--
--gboolean
--brasero_medium_get_track_address (BraseroMedium *medium,
--				  guint num,
--				  gint64 *byte,
--				  gint64 *sector)
--{
--	BraseroMediumPrivate *priv;
--	BraseroMediumTrack *track;
--
--	priv = BRASERO_MEDIUM_PRIVATE (medium);
--
--	track = brasero_medium_get_track (medium, num);
--	if (!track) {
--		if (byte)
--			*byte = -1;
--		if (sector)
--			*sector = -1;
--		return FALSE;
--	}
--
--	if (byte)
--		*byte = track->start * priv->block_size;
--	if (sector)
--		*sector = track->start;
--
--	return TRUE;	
--}
--
--gint64
--brasero_medium_get_next_writable_address (BraseroMedium *medium)
--{
--	BraseroMediumPrivate *priv;
--
--	priv = BRASERO_MEDIUM_PRIVATE (medium);
--	return priv->next_wr_add;
--}
--
--gint64
--brasero_medium_get_max_write_speed (BraseroMedium *medium)
--{
--	BraseroMediumPrivate *priv;
--
--	priv = BRASERO_MEDIUM_PRIVATE (medium);
--	return priv->max_wrt * 1024;
--}
--
--/**
-- * NOTEs about the following functions:
-- * for all closed media (including ROM types) capacity == size of data and 
-- * should be the size of all data on the disc, free space is 0
-- * for all blank -R types capacity == free space and size of data == 0
-- * for all multisession -R types capacity == free space since having the real
-- * capacity of the media would be useless as we can only use this type of media
-- * to append more data
-- * for all -RW types capacity = free space + size of data. Here they can be 
-- * appended (use free space) or rewritten (whole capacity).
-- *
-- * Usually:
-- * the free space is the size of the leadout track
-- * the size of data is the sum of track sizes (excluding leadout)
-- * the capacity depends on the media:
-- * for closed discs == sum of track sizes
-- * for multisession discs == free space (leadout size)
-- * for blank discs == (free space) leadout size
-- * for rewritable/blank == use SCSI functions to get capacity (see below)
-- *
-- * In fact we should really need the size of data in DVD+/-RW cases since the
-- * session is always equal to the size of the disc. 
-- */
--
--void
--brasero_medium_get_data_size (BraseroMedium *medium,
--			      gint64 *size,
--			      gint64 *blocks)
--{
--	GSList *iter;
--	BraseroMediumPrivate *priv;
--	BraseroMediumTrack *track = NULL;
--
--	priv = BRASERO_MEDIUM_PRIVATE (medium);
--
--	if (!priv->tracks) {
--		/* that's probably because it wasn't possible to retrieve info */
--		if (size)
--			*size = 0;
--
--		if (blocks)
--			*blocks = 0;
--
--		return;
--	}
--
--	for (iter = priv->tracks; iter; iter = iter->next) {
--		BraseroMediumTrack *tmp;
--
--		tmp = iter->data;
--		if (tmp->type == BRASERO_MEDIUM_TRACK_LEADOUT)
--			break;
--
--		track = iter->data;
--	}
--
--	if (size)
--		*size = track ? (track->start + track->blocks_num) * priv->block_size: 0;
--
--	if (blocks)
--		*blocks = track ? track->start + track->blocks_num: 0;
--}
--
--void
--brasero_medium_get_free_space (BraseroMedium *medium,
--			       gint64 *size,
--			       gint64 *blocks)
--{
--	GSList *iter;
--	BraseroMediumPrivate *priv;
--	BraseroMediumTrack *track = NULL;
--
--	priv = BRASERO_MEDIUM_PRIVATE (medium);
--
--	if (!priv->tracks) {
--		/* that's probably because it wasn't possible to retrieve info.
--		 * maybe it also happens with unformatted DVD+RW */
--
--		if (priv->info & BRASERO_MEDIUM_CLOSED) {
--			if (size)
--				*size = 0;
--
--			if (blocks)
--				*blocks = 0;
--		}
--		else {
--			if (size)
--				*size = priv->block_num * priv->block_size;
--
--			if (blocks)
--				*blocks = priv->block_num;
--		}
--
--		return;
--	}
--
--	for (iter = priv->tracks; iter; iter = iter->next) {
--		BraseroMediumTrack *tmp;
--
--		tmp = iter->data;
--		if (tmp->type == BRASERO_MEDIUM_TRACK_LEADOUT) {
--			track = iter->data;
--			break;
--		}
--	}
--
--	if (size) {
--		if (!track) {
--			/* No leadout was found so the disc is probably closed:
--			 * no free space left. */
--			*size = 0;
--		}
--		else if (track->blocks_num <= 0)
--			*size = (priv->block_num - track->start) * priv->block_size;
--		else
--			*size = track->blocks_num * priv->block_size;
--	}
--
--	if (blocks) {
--		if (!track) {
--			/* No leadout was found so the disc is probably closed:
--			 * no free space left. */
--			*blocks = 0;
--		}
--		else if (track->blocks_num <= 0)
--			*blocks = priv->block_num - track->blocks_num;
--		else
--			*blocks = track->blocks_num;
--	}
--}
--
--void
--brasero_medium_get_capacity (BraseroMedium *medium,
--			     gint64 *size,
--			     gint64 *blocks)
--{
--	BraseroMediumPrivate *priv;
--
--	priv = BRASERO_MEDIUM_PRIVATE (medium);
--
--	if (priv->info & BRASERO_MEDIUM_REWRITABLE) {
--		if (size)
--			*size = priv->block_num * priv->block_size;
--
--		if (blocks)
--			*blocks = priv->block_num;
--	}
--	else  if (priv->info & BRASERO_MEDIUM_CLOSED)
--		brasero_medium_get_data_size (medium, size, blocks);
--	else
--		brasero_medium_get_free_space (medium, size, blocks);
--}
--
--/**
-- * Function to retrieve the capacity of a media
-- */
--
--static BraseroBurnResult
--brasero_medium_get_capacity_CD_RW (BraseroMedium *self,
--				   int fd,
--				   BraseroScsiErrCode *code)
--{
--	BraseroScsiAtipData *atip_data = NULL;
--	BraseroMediumPrivate *priv;
--	BraseroScsiResult result;
--	int size = 0;
--
--	priv = BRASERO_MEDIUM_PRIVATE (self);
--
--	BRASERO_BURN_LOG ("Retrieving capacity from atip");
--
--	result = brasero_mmc1_read_atip (fd,
--					 &atip_data,
--					 &size,
--					 NULL);
--
--	if (result != BRASERO_SCSI_OK) {
--		BRASERO_BURN_LOG ("READ ATIP failed (scsi error)");
--		return BRASERO_BURN_ERR;
--	}
--
--	/* check the size of the structure: it must be at least 16 bytes long */
--	if (size < 16) {
--		if (size)
--			g_free (atip_data);
--
--		BRASERO_BURN_LOG ("READ ATIP failed (wrong size)");
--		return BRASERO_BURN_ERR;
--	}
--
--	priv->block_num = BRASERO_MSF_TO_LBA (atip_data->desc->leadout_mn,
--					      atip_data->desc->leadout_sec,
--					      atip_data->desc->leadout_frame);
--	g_free (atip_data);
--
--	BRASERO_BURN_LOG ("Format capacity %lli %lli",
--			  priv->block_num,
--			  priv->block_size);
--
--	return BRASERO_BURN_OK;
--}
--
--static BraseroBurnResult
--brasero_medium_get_capacity_DVD_RW (BraseroMedium *self,
--				    int fd,
--				    BraseroScsiErrCode *code)
--{
--	BraseroScsiFormatCapacitiesHdr *hdr = NULL;
--	BraseroScsiMaxCapacityDesc *current;
--	BraseroMediumPrivate *priv;
--	BraseroScsiResult result;
--	gint size;
--
--	BRASERO_BURN_LOG ("Retrieving format capacity");
--
--	priv = BRASERO_MEDIUM_PRIVATE (self);
--	result = brasero_mmc2_read_format_capacities (fd,
--						      &hdr,
--						      &size,
--						      code);
--	if (result != BRASERO_SCSI_OK) {
--		g_free (hdr);
--
--		BRASERO_BURN_LOG ("READ FORMAT CAPACITIES failed");
--		return BRASERO_BURN_ERR;
--	}
--
--	current = hdr->max_caps;
--
--	/* see if the media is already formatted */
--	if (current->type != BRASERO_SCSI_DESC_FORMATTED) {
--		int i, max;
--		BraseroScsiFormattableCapacityDesc *desc;
--
--		max = (hdr->len - 
--		      sizeof (BraseroScsiMaxCapacityDesc)) /
--		      sizeof (BraseroScsiFormattableCapacityDesc);
--
--		desc = hdr->desc;
--		for (i = 0; i < max; i ++, desc ++) {
--			/* search for the correct descriptor */
--			if (BRASERO_MEDIUM_IS (priv->info, BRASERO_MEDIUM_DVDRW_PLUS)) {
--				if (desc->format_type == BRASERO_SCSI_DVDRW_PLUS) {
--					priv->block_num = BRASERO_GET_32 (desc->blocks_num);
--					priv->block_size = BRASERO_GET_24 (desc->type_param);
--
--					/* that can happen */
--					if (!priv->block_size)
--						priv->block_size = 2048;
--					break;
--				}
--			}
--			else if (desc->format_type == BRASERO_SCSI_BLOCK_SIZE_DEFAULT_AND_DB) {
--				priv->block_num = BRASERO_GET_32 (desc->blocks_num);
--				priv->block_size = BRASERO_GET_24 (desc->type_param);
--				break;
--			}
--		}
--	}
--	else {
--		priv->block_num = BRASERO_GET_32 (current->blocks_num);
--		priv->block_size = BRASERO_GET_24 (current->block_size);
--	}
--
--	BRASERO_BURN_LOG ("Format capacity %lli %lli",
--			  priv->block_num,
--			  priv->block_size);
--
--	g_free (hdr);
--	return BRASERO_BURN_OK;
--}
--
--static BraseroBurnResult
--brasero_medium_get_capacity_by_type (BraseroMedium *self,
--				     int fd,
--				     BraseroScsiErrCode *code)
--{
--	BraseroMediumPrivate *priv;
--
--	priv = BRASERO_MEDIUM_PRIVATE (self);
--
--	priv->block_size = 2048;
--
--	if (!(priv->info & BRASERO_MEDIUM_REWRITABLE))
--		return BRASERO_BURN_OK;
--
--	if (priv->info & BRASERO_MEDIUM_CD)
--		brasero_medium_get_capacity_CD_RW (self, fd, code);
--	else
--		brasero_medium_get_capacity_DVD_RW (self, fd, code);
--
--	return BRASERO_BURN_OK;
--}
--
--/**
-- * Functions to retrieve the speed
-- */
--
--static BraseroBurnResult
--brasero_medium_get_speed_mmc3 (BraseroMedium *self,
--			       int fd,
--			       BraseroScsiErrCode *code)
--{
--	int size;
--	int num_desc, i;
--	gint max_rd, max_wrt;
--	BraseroScsiResult result;
--	BraseroMediumPrivate *priv;
--	BraseroScsiWrtSpdDesc *desc;
--	BraseroScsiGetPerfData *wrt_perf = NULL;
--
--	BRASERO_BURN_LOG ("Retrieving speed (Get Performance)");
--
--	/* NOTE: this only work if there is RT streaming feature with
--	 * wspd bit set to 1. At least an MMC3 drive. */
--	priv = BRASERO_MEDIUM_PRIVATE (self);
--	result = brasero_mmc3_get_performance_wrt_spd_desc (fd,
--							    &wrt_perf,
--							    &size,
--							    code);
--
--	if (result != BRASERO_SCSI_OK) {
--		g_free (wrt_perf);
--
--		BRASERO_BURN_LOG ("GET PERFORMANCE failed");
--		return BRASERO_BURN_ERR;
--	}
--
--	num_desc = (size - sizeof (BraseroScsiGetPerfHdr)) /
--		    sizeof (BraseroScsiWrtSpdDesc);
--
--	if (num_desc <=  0)
--		goto end; 
--
--	priv->rd_speeds = g_new0 (gint, num_desc + 1);
--	priv->wr_speeds = g_new0 (gint, num_desc + 1);
--
--	max_rd = 0;
--	max_wrt = 0;
--
--	desc = (BraseroScsiWrtSpdDesc*) &wrt_perf->data;
--	for (i = 0; i < num_desc; i ++, desc ++) {
--		priv->rd_speeds [i] = BRASERO_GET_32 (desc->rd_speed);
--		priv->wr_speeds [i] = BRASERO_GET_32 (desc->wr_speed);
--
--		max_rd = MAX (max_rd, priv->rd_speeds [i]);
--		max_wrt = MAX (max_wrt, priv->wr_speeds [i]);
--	}
--
--	priv->max_rd = max_rd;
--	priv->max_wrt = max_wrt;
--
--end:
--
--	g_free (wrt_perf);
--
--	/* strangely there are so drives (I know one case) which support this
--	 * function but don't report any speed. So if our top speed is 0 then
--	 * use the other way to get the speed. It was a Teac */
--	if (!priv->max_wrt)
--		return BRASERO_BURN_ERR;
--
--	return BRASERO_BURN_OK;
--}
--
--static BraseroBurnResult
--brasero_medium_get_page_2A_write_speed_desc (BraseroMedium *self,
--					     int fd,
--					     BraseroScsiErrCode *code)
--{
--	BraseroScsiStatusPage *page_2A = NULL;
--	BraseroScsiStatusWrSpdDesc *desc;
--	BraseroScsiModeData *data = NULL;
--	BraseroMediumPrivate *priv;
--	BraseroScsiResult result;
--	gint desc_num, i;
--	gint max_wrt = 0;
--	gint max_num;
--	int size = 0;
--
--	BRASERO_BURN_LOG ("Retrieving speed (2A speeds)");
--
--	priv = BRASERO_MEDIUM_PRIVATE (self);
--	result = brasero_spc1_mode_sense_get_page (fd,
--						   BRASERO_SPC_PAGE_STATUS,
--						   &data,
--						   &size,
--						   code);
--	if (result != BRASERO_SCSI_OK) {
--		g_free (data);
--
--		BRASERO_BURN_LOG ("MODE SENSE failed");
--		return BRASERO_BURN_ERR;
--	}
--
--	page_2A = (BraseroScsiStatusPage *) &data->page;
--
--	/* FIXME: the following is not necessarily true */
--	if (size < sizeof (BraseroScsiStatusPage)) {
--		g_free (data);
--
--		BRASERO_BURN_LOG ("wrong size in page");
--		return BRASERO_BURN_ERR;
--	}
--
--	desc_num = BRASERO_GET_16 (page_2A->wr_speed_desc_num);
--	max_num = size -
--		  sizeof (BraseroScsiStatusPage) -
--		  sizeof (BraseroScsiModeHdr);
--	max_num /= sizeof (BraseroScsiWrtSpdDesc);
--
--	if (max_num < 0)
--		max_num = 0;
--
--	if (desc_num > max_num)
--		desc_num = max_num;
--
--	priv->wr_speeds = g_new0 (gint, desc_num + 1);
--	desc = page_2A->wr_spd_desc;
--	for (i = 0; i < desc_num; i ++, desc ++) {
--		priv->wr_speeds [i] = BRASERO_GET_16 (desc->speed);
--		max_wrt = MAX (max_wrt, priv->wr_speeds [i]);
--	}
--
--	if (!max_wrt)
--		priv->max_wrt = BRASERO_GET_16 (page_2A->wr_max_speed);
--	else
--		priv->max_wrt = max_wrt;
--
--	priv->max_rd = BRASERO_GET_16 (page_2A->rd_max_speed);
--	g_free (data);
--
--	return BRASERO_BURN_OK;
--}
--
--static BraseroBurnResult
--brasero_medium_get_page_2A_max_speed (BraseroMedium *self,
--				      int fd,
--				      BraseroScsiErrCode *code)
--{
--	BraseroScsiStatusPage *page_2A = NULL;
--	BraseroScsiModeData *data = NULL;
--	BraseroMediumPrivate *priv;
--	BraseroScsiResult result;
--	int size = 0;
--
--	BRASERO_BURN_LOG ("Retrieving speed (2A max)");
--
--	priv = BRASERO_MEDIUM_PRIVATE (self);
--
--	result = brasero_spc1_mode_sense_get_page (fd,
--						   BRASERO_SPC_PAGE_STATUS,
--						   &data,
--						   &size,
--						   code);
--	if (result != BRASERO_SCSI_OK) {
--		g_free (data);
--
--		BRASERO_BURN_LOG ("MODE SENSE failed");
--		return BRASERO_BURN_ERR;
--	}
--
--	page_2A = (BraseroScsiStatusPage *) &data->page;
--
--	if (size < 0x14) {
--		g_free (data);
--
--		BRASERO_BURN_LOG ("wrong page size");
--		return BRASERO_BURN_ERR;
--	}
--
--	priv->max_rd = BRASERO_GET_16 (page_2A->rd_max_speed);
--	priv->max_wrt = BRASERO_GET_16 (page_2A->wr_max_speed);
--
--	g_free (data);
--	return BRASERO_BURN_OK;
--}
--
--static BraseroBurnResult
--brasero_medium_get_medium_type (BraseroMedium *self,
--				int fd,
--				BraseroScsiErrCode *code)
--{
--	BraseroScsiGetConfigHdr *hdr = NULL;
--	BraseroMediumPrivate *priv;
--	BraseroScsiResult result;
--	int size;
--
--	BRASERO_BURN_LOG ("Retrieving media profile");
--
--	priv = BRASERO_MEDIUM_PRIVATE (self);
--	result = brasero_mmc2_get_configuration_feature (fd,
--							 BRASERO_SCSI_FEAT_REAL_TIME_STREAM,
--							 &hdr,
--							 &size,
--							 code);
--	if (result != BRASERO_SCSI_OK) {
--		BraseroScsiAtipData *data = NULL;
--		int size = 0;
--
--		BRASERO_BURN_LOG ("GET CONFIGURATION failed");
--
--		/* This could be a MMC1 drive since this command was
--		 * introduced in MMC2 and is supported onward. So it
--		 * has to be a CD (R/RW). The rest of the information
--		 * will be provided by read_disc_information. */
--
--		/* The only thing here left to determine is if that's a WRITABLE
--		 * or a REWRITABLE. To determine that information, we need to
--		 * read TocPmaAtip. It if fails that's a ROM, if it succeeds.
--		 * No need to set error code since we consider that it's a ROM
--		 * if a failure happens. */
--		result = brasero_mmc1_read_atip (fd,
--						 &data,
--						 &size,
--						 NULL);
--		if (result != BRASERO_SCSI_OK) {
--			/* CDROM */
--			priv->info = BRASERO_MEDIUM_CDROM;
--			priv->type = types [1];
--			priv->icon = icons [1];
--		}
--		else {
--			/* check the size of the structure: it must be at least 8 bytes long */
--			if (size < 8) {
--				if (size)
--					g_free (data);
--
--				BRASERO_BURN_LOG ("READ ATIP failed (wrong size)");
--				return BRASERO_BURN_ERR;
--			}
--
--			if (data->desc->erasable) {
--				/* CDRW */
--				priv->info = BRASERO_MEDIUM_CDRW;
--				priv->type = types [3];
--				priv->icon = icons [3];
--			}
--			else {
--				/* CDR */
--				priv->info = BRASERO_MEDIUM_CDR;
--				priv->type = types [2];
--				priv->icon = icons [2];
--			}
--
--			g_free (data);
--		}
--
--		/* retrieve the speed */
--		result = brasero_medium_get_page_2A_max_speed (self,
--							       fd,
--							       code);
--		return result;
--	}
--
--	switch (BRASERO_GET_16 (hdr->current_profile)) {
--	case BRASERO_SCSI_PROF_CDROM:
--		priv->info = BRASERO_MEDIUM_CDROM;
--		priv->type = types [1];
--		priv->icon = icons [1];
--		break;
--
--	case BRASERO_SCSI_PROF_CDR:
--		priv->info = BRASERO_MEDIUM_CDR;
--		priv->type = types [2];
--		priv->icon = icons [2];
--		break;
--
--	case BRASERO_SCSI_PROF_CDRW:
--		priv->info = BRASERO_MEDIUM_CDRW;
--		priv->type = types [3];
--		priv->icon = icons [3];
--		break;
--
--	case BRASERO_SCSI_PROF_DVD_ROM:
--		priv->info = BRASERO_MEDIUM_DVD_ROM;
--		priv->type = types [4];
--		priv->icon = icons [4];
--		break;
--
--	case BRASERO_SCSI_PROF_DVD_R:
--		priv->info = BRASERO_MEDIUM_DVDR;
--		priv->type = types [5];
--		priv->icon = icons [5];
--		break;
--
--	case BRASERO_SCSI_PROF_DVD_RW_RESTRICTED:
--		priv->info = BRASERO_MEDIUM_DVDRW_RESTRICTED;
--		priv->type = types [6];
--		priv->icon = icons [6];
--		break;
--
--	case BRASERO_SCSI_PROF_DVD_RW_SEQUENTIAL:
--		priv->info = BRASERO_MEDIUM_DVDRW;
--		priv->type = types [6];
--		priv->icon = icons [6];
--		break;
--
--	case BRASERO_SCSI_PROF_DVD_R_PLUS:
--		priv->info = BRASERO_MEDIUM_DVDR_PLUS;
--		priv->type = types [7];
--		priv->icon = icons [7];
--		break;
--
--	case BRASERO_SCSI_PROF_DVD_RW_PLUS:
--		priv->info = BRASERO_MEDIUM_DVDRW_PLUS;
--		priv->type = types [8];
--		priv->icon = icons [7];
--		break;
--
--	/* WARNING: these types are recognized, no more */
--	case BRASERO_SCSI_PROF_DVD_R_PLUS_DL:
--		priv->info = BRASERO_MEDIUM_DVDR_PLUS_DL;
--		priv->type = types [9];
--		priv->icon = icons [7];
--		break;
--
--	case BRASERO_SCSI_PROF_DVD_RW_PLUS_DL:
--		priv->info = BRASERO_MEDIUM_DVDRW_PLUS_DL;
--		priv->type = types [10];
--		priv->icon = icons [7];
--		break;
--
--	case BRASERO_SCSI_PROF_DVD_R_DL_SEQUENTIAL:
--		priv->info = BRASERO_MEDIUM_DVDR_DL;
--		priv->type = types [11];
--		priv->icon = icons [5];
--		break;
--
--	case BRASERO_SCSI_PROF_DVD_R_DL_JUMP:
--		priv->info = BRASERO_MEDIUM_DVDR_JUMP_DL;
--		priv->type = types [11];
--		priv->icon = icons [5];
--		break;
--
--	case BRASERO_SCSI_PROF_DVD_RAM:
--		priv->info = BRASERO_MEDIUM_DVD_RAM;
--		priv->type = types [12];
--		priv->icon = icons [8];
--		break;
--
--	case BRASERO_SCSI_PROF_BD_ROM:
--		priv->info = BRASERO_MEDIUM_BD_ROM;
--		priv->type = types [13];
--		priv->icon = icons [4];
--		break;
--
--	case BRASERO_SCSI_PROF_BR_R_SEQUENTIAL:
--		priv->info = BRASERO_MEDIUM_BDR;
--		priv->type = types [14];
--		priv->icon = icons [5];
--		break;
--
--	case BRASERO_SCSI_PROF_BR_R_RANDOM:
--		priv->info = BRASERO_MEDIUM_BDR_RANDOM;
--		priv->type = types [14];
--		priv->icon = icons [5];
--		break;
--
--	case BRASERO_SCSI_PROF_BD_RW:
--		priv->info = BRASERO_MEDIUM_BDRW;
--		priv->type = types [15];
--		priv->icon = icons [6];
--		break;
--
--	case BRASERO_SCSI_PROF_NON_REMOVABLE:
--	case BRASERO_SCSI_PROF_REMOVABLE:
--	case BRASERO_SCSI_PROF_MO_ERASABLE:
--	case BRASERO_SCSI_PROF_MO_WRITE_ONCE:
--	case BRASERO_SCSI_PROF_MO_ADVANCED_STORAGE:
--	case BRASERO_SCSI_PROF_DDCD_ROM:
--	case BRASERO_SCSI_PROF_DDCD_R:
--	case BRASERO_SCSI_PROF_DDCD_RW:
--	case BRASERO_SCSI_PROF_HD_DVD_ROM:
--	case BRASERO_SCSI_PROF_HD_DVD_R:
--	case BRASERO_SCSI_PROF_HD_DVD_RAM:
--		priv->info = BRASERO_MEDIUM_UNSUPPORTED;
--		priv->icon = icons [0];
--		g_free (hdr);
--		return BRASERO_BURN_NOT_SUPPORTED;
--	}
--
--	/* try all SCSI functions to get write/read speeds in order */
--	if (hdr->desc->add_len >= sizeof (BraseroScsiRTStreamDesc)) {
--		BraseroScsiRTStreamDesc *stream;
--
--		/* means it's at least an MMC3 drive */
--		stream = (BraseroScsiRTStreamDesc *) hdr->desc->data;
--		if (stream->wrt_spd) {
--			result = brasero_medium_get_speed_mmc3 (self, fd, code);
--			if (result == BRASERO_BURN_OK)
--				goto end;
--		}
--
--		if (stream->mp2a) {
--			result = brasero_medium_get_page_2A_write_speed_desc (self, fd, code);
--			if (result == BRASERO_BURN_OK)
--				goto end;
--		}
--	}
--
--	/* fallback for speeds */
--	result = brasero_medium_get_page_2A_max_speed (self, fd, code);
--
--end:
--
--	g_free (hdr);
--
--	if (result != BRASERO_BURN_OK)
--		return result;
--
--	return BRASERO_BURN_OK;
--}
--
--static BraseroBurnResult
--brasero_medium_get_css_feature (BraseroMedium *self,
--				int fd,
--				BraseroScsiErrCode *code)
--{
--	BraseroScsiGetConfigHdr *hdr = NULL;
--	BraseroMediumPrivate *priv;
--	BraseroScsiResult result;
--	int size;
--
--	priv = BRASERO_MEDIUM_PRIVATE (self);
--
--	BRASERO_BURN_LOG ("Testing for Css encrypted media");
--	result = brasero_mmc2_get_configuration_feature (fd,
--							 BRASERO_SCSI_FEAT_DVD_CSS,
--							 &hdr,
--							 &size,
--							 code);
--	if (result != BRASERO_SCSI_OK) {
--		g_free (hdr);
--
--		BRASERO_BURN_LOG ("GET CONFIGURATION failed");
--		return BRASERO_BURN_ERR;
--	}
--
--	if (hdr->desc->add_len < sizeof (BraseroScsiDVDCssDesc)) {
--		g_free (hdr);
--		return BRASERO_BURN_OK;
--	}
--
--	/* here we just need to see if this feature is current or not */
--	if (hdr->desc->current) {
--		priv->info |= BRASERO_MEDIUM_PROTECTED;
--		BRASERO_BURN_LOG ("media is Css protected");
--	}
--
--	g_free (hdr);
--	return BRASERO_BURN_OK;
--}
--
--/**
-- * Functions to get information about disc contents
-- */
--
--static void
--brasero_medium_set_track_type (BraseroMedium *self,
--			       BraseroMediumTrack *track,
--			       guchar control)
--{
--	BraseroMediumPrivate *priv;
--
--	priv = BRASERO_MEDIUM_PRIVATE (self);
--
--	if (control & BRASERO_SCSI_TRACK_COPY)
--		track->type |= BRASERO_MEDIUM_TRACK_COPY;
--
--	if (!(control & BRASERO_SCSI_TRACK_DATA)) {
--		track->type |= BRASERO_MEDIUM_TRACK_AUDIO;
--		priv->info |= BRASERO_MEDIUM_HAS_AUDIO;
--
--		if (control & BRASERO_SCSI_TRACK_PREEMP)
--			track->type |= BRASERO_MEDIUM_TRACK_PREEMP;
--
--		if (control & BRASERO_SCSI_TRACK_4_CHANNELS)
--			track->type |= BRASERO_MEDIUM_TRACK_4_CHANNELS;
--	}
--	else {
--		track->type |= BRASERO_MEDIUM_TRACK_DATA;
--		priv->info |= BRASERO_MEDIUM_HAS_DATA;
--
--		if (control & BRASERO_SCSI_TRACK_DATA_INCREMENTAL)
--			track->type |= BRASERO_MEDIUM_TRACK_INCREMENTAL;
--	}
--}
--
--static BraseroBurnResult
--brasero_medium_track_volume_size (BraseroMedium *self,
--				  BraseroMediumTrack *track,
--				  int fd)
--{
--	BraseroMediumPrivate *priv;
--	BraseroBurnResult res;
--	GError *error = NULL;
--	gint64 nb_blocks;
--
--	if (!track)
--		return BRASERO_BURN_ERR;
--
--	priv = BRASERO_MEDIUM_PRIVATE (self);
--
--	/* This is a special case. For DVD+RW and DVD-RW in restricted
--	 * mode, there is only one session that takes the whole disc size
--	 * once formatted. That doesn't necessarily means they have data
--	 * Note also that they are reported as complete though you can
--	 * still add data (with growisofs). It is nevertheless on the 
--	 * condition that the fs is valid.
--	 * So we check if their first and only volume is valid. 
--	 * That's also used when the track size is reported a 300 Kio
--	 * see below */
--	res = brasero_volume_get_size_fd (fd,
--					  track->start,
--					  &nb_blocks,
--					  NULL);
--	if (!res) {
--		BRASERO_BURN_LOG ("Failed to retrieve the volume size: %s",
--				  error && error->message ? 
--				  error->message:"unknown error");
--
--		if (error)
--			g_error_free (error);
--		return BRASERO_BURN_ERR;
--	}
--
--	track->blocks_num = nb_blocks;
--	return BRASERO_BURN_OK;
--}
--
--static BraseroBurnResult
--brasero_medium_track_get_info (BraseroMedium *self,
--			       BraseroMediumTrack *track,
--			       int track_num,
--			       int fd,
--			       BraseroScsiErrCode *code)
--{
--	BraseroScsiTrackInfo track_info;
--	BraseroMediumPrivate *priv;
--	BraseroScsiResult result;
--	int size;
--
--	BRASERO_BURN_LOG ("Retrieving track information for %i", track_num);
--
--	priv = BRASERO_MEDIUM_PRIVATE (self);
--
--	/* at this point we know the type of the disc that's why we set the 
--	 * size according to this type. That may help to avoid outrange address
--	 * errors. */
--	if (BRASERO_MEDIUM_IS (priv->info, BRASERO_MEDIUM_DL|BRASERO_MEDIUM_WRITABLE))
--		size = 48;
--	else if (BRASERO_MEDIUM_IS (priv->info, BRASERO_MEDIUM_PLUS|BRASERO_MEDIUM_WRITABLE))
--		size = 40;
--	else
--		size = 36;
--
--	result = brasero_mmc1_read_track_info (fd,
--					       track_num,
--					       &track_info,
--					       &size,
--					       code);
--
--	if (result != BRASERO_SCSI_OK) {
--		BRASERO_BURN_LOG ("READ TRACK INFO failed");
--		return BRASERO_BURN_ERR;
--	}
--
--	track->blocks_num = BRASERO_GET_32 (track_info.track_size);
--	track->session = BRASERO_SCSI_SESSION_NUM (track_info);
--
--	/* Now here is a potential bug: we can write tracks (data or not)
--	 * shorter than 300 Kio /2 sec but they will be padded to reach this
--	 * floor value. That means that is blocks_num is 300 blocks that may
--	 * mean that the data length on the track is actually shorter.
--	 * So we read the volume descriptor. If it works, good otherwise
--	 * use the old value.
--	 * That's important for checksuming to have a perfect account of the 
--	 * data size. */
--	if (track->blocks_num <= 300) {
--		BRASERO_BURN_LOG ("300 sectors size. Checking for real size");
--		brasero_medium_track_volume_size (self, track, fd);
--	}
--
--	if (track_info.next_wrt_address_valid)
--		priv->next_wr_add = BRASERO_GET_32 (track_info.next_wrt_address);
--
--	BRASERO_BURN_LOG ("Track %i (session %i): type = %i start = %llu size = %llu",
--			  track_num,
--			  track->session,
--			  track->type,
--			  track->start,
--			  track->blocks_num);
--
--	return BRASERO_BURN_OK;
--}
--
--/**
-- * return :
-- *  0 when it's not possible to determine (fallback to formatted toc)
-- * -1 for BCD
-- *  1 for HEX */
--static guint
--brasero_medium_check_BCD_use (BraseroMedium *self,
--			      int fd,
--			      BraseroScsiRawTocDesc *desc,
--			      guint num,
--			      BraseroScsiErrCode *code)
--{
--	guint i;
--	int size;
--	guint leadout = 0;
--	guint track_num = 0;
--	gboolean use_BCD = TRUE;
--	gboolean use_HEX = TRUE;
--	BraseroScsiResult result;
--	BraseroScsiTrackInfo track_info;
--	guint start_BCD, start_LBA, track_start;
--
--	/* first check if all values are valid BCD numbers in the descriptors */
--	for (i = 0; i < num; i++) {
--		if (desc [i].adr == 1 && desc [i].point <= BRASERO_SCSI_Q_SUB_CHANNEL_TRACK_START) {
--			if (!BRASERO_IS_BCD_VALID (desc [i].p_min)
--			||  !BRASERO_IS_BCD_VALID (desc [i].p_sec)
--			||  !BRASERO_IS_BCD_VALID (desc [i].p_frame)) {
--				use_BCD = FALSE;
--				break;
--			}
--		}
--		else if (desc [i].point == BRASERO_SCSI_Q_SUB_CHANNEL_LEADOUT_START) {
--			if (!BRASERO_IS_BCD_VALID (desc [i].p_min)
--			||  !BRASERO_IS_BCD_VALID (desc [i].p_sec)
--			||  !BRASERO_IS_BCD_VALID (desc [i].p_frame)) {
--				use_BCD = FALSE;
--				break;
--			}
--		}
--	}
--
--	/* then check if there are valid Hex values */
--	for (i = 0; i < num; i++) {
--		if (desc [i].adr != 1 || desc [i].point > BRASERO_SCSI_Q_SUB_CHANNEL_TRACK_START)
--			continue;
--
--		if (desc [i].p_min > 99
--		||  desc [i].p_sec > 59
--		||  desc [i].p_frame > 74) {
--			use_HEX = FALSE;
--			break;
--		}
--	}
--
--	if (use_BCD != use_HEX) {
--		if (use_BCD)
--			return -1;
--
--		return 1;
--	}
--
--	/* To check if the drive uses BCD values or HEX values we ask for the 
--	 * track information that contains also the start for the track but in
--	 * HEX values. If values are the same then it works. */
--
--	/* NOTE: there could be another way to do it: get first track, in LBA
--	 * and BCD it must be 150. */
--
--	/* First find the first track and get track start address in BCD */
--	BRASERO_BURN_LOG ("Retrieving track information to determine number format");
--
--	for (i = 0; i < num; i++) {
--		if (desc [i].adr == BRASERO_SCSI_Q_SUB_CHANNEL_LEADIN_MODE5
--		&&  desc [i].point == BRASERO_SCSI_Q_SUB_CHANNEL_MULTI_NEXT_SESSION) {
--			/* store the leadout number just in case */
--			leadout = i;
--			continue;
--		}
--
--		if (desc [i].adr != 1 || desc [i].point > BRASERO_SCSI_Q_SUB_CHANNEL_TRACK_START)
--			continue;
--
--		track_num ++;
--
--		start_BCD = BRASERO_MSF_TO_LBA (BRASERO_GET_BCD (desc [i].p_min),
--						BRASERO_GET_BCD (desc [i].p_sec),
--						BRASERO_GET_BCD (desc [i].p_frame));
--
--		start_LBA = BRASERO_MSF_TO_LBA (desc [i].p_min,
--						desc [i].p_sec,
--						desc [i].p_frame);
--
--		BRASERO_BURN_LOG ("Comparing to track information from READ TRACK INFO for track %i", track_num);
--
--		size = 36;
--		start_LBA -= 150;
--		start_BCD -= 150;
--
--		result = brasero_mmc1_read_track_info (fd,
--						       track_num,
--						       &track_info,
--						       &size,
--						       code);
--
--		if (result != BRASERO_SCSI_OK) {
--			BRASERO_BURN_LOG ("READ TRACK INFO failed");
--			/* Fallback to formatted toc */
--			return 0;
--		}
--
--		track_start = BRASERO_GET_32 (track_info.start_lba);
--		BRASERO_BURN_LOG ("comparing DCB %i and LBA %i to real start address %i",
--				  start_BCD, start_LBA, track_start);
--
--		/* try to find a conclusive match */
--		if (track_start == start_BCD && track_start != start_LBA)
--			return -1;
--
--		if (track_start == start_LBA && track_start != start_BCD)
--			return 1;
--	}
--
--	/* Our last chance, the leadout.
--	 * NOTE: no need to remove 150 sectors here. */
--	start_BCD = BRASERO_MSF_TO_LBA (BRASERO_GET_BCD (desc [leadout].min),
--					BRASERO_GET_BCD (desc [leadout].sec),
--					BRASERO_GET_BCD (desc [leadout].frame));
--
--	start_LBA = BRASERO_MSF_TO_LBA (desc [leadout].min,
--					desc [leadout].sec,
--					desc [leadout].frame);
--
--	BRASERO_BURN_LOG ("Comparing to track information from READ TRACK INFO for leadout");
--
--	size = 36;
--
--	/* leadout number is number of tracks + 1 */
--	result = brasero_mmc1_read_track_info (fd,
--					       track_num + 1,
--					       &track_info,
--					       &size,
--					       code);
--
--	if (result != BRASERO_SCSI_OK) {
--		BRASERO_BURN_LOG ("READ TRACK INFO failed for leadout");
--		/* Fallback to formatted toc */
--		return 0;
--	}
--
--	track_start = BRASERO_GET_32 (track_info.start_lba);
--	BRASERO_BURN_LOG ("comparing DCB %i and LBA %i to real start address %i",
--			  start_BCD, start_LBA, track_start);
--
--	/* try to find a conclusive match */
--	if (track_start == start_BCD && track_start != start_LBA)
--		return -1;
--
--	if (track_start == start_LBA && track_start != start_BCD)
--		return 1;
--
--	/* fallback to formatted toc */
--	return 0;
--}
--
--/**
-- * The reason why we use this perhaps more lengthy method is that with
-- * multisession discs, the first track is reported to be two sectors shorter
-- * than it should. As I don't know why and since the following works we use
-- * this one. */
--static BraseroBurnResult
--brasero_medium_get_CD_sessions_info (BraseroMedium *self,
--				     int fd,
--				     BraseroScsiErrCode *code)
--{
--	gint use_bcd;
--	GSList *iter;
--	int num, i, size;
--	gint leadout_start = 0;
--	BraseroScsiResult result;
--	BraseroMediumPrivate *priv;
--	BraseroScsiRawTocDesc *desc;
--	BraseroScsiRawTocData *toc = NULL;
--
--	BRASERO_BURN_LOG ("Reading Raw Toc");
--
--	priv = BRASERO_MEDIUM_PRIVATE (self);
--
--	size = 0;
--	result = brasero_mmc1_read_toc_raw (fd,
--					    0,
--					    &toc,
--					    &size,
--					    code);
--	if (result != BRASERO_SCSI_OK) {
--		BRASERO_BURN_LOG ("READ TOC failed");
--		return BRASERO_BURN_ERR;
--	}
--
--	num = (size - sizeof (BraseroScsiRawTocData)) /
--	       sizeof (BraseroScsiRawTocDesc);
--
--	BRASERO_BURN_LOG ("%i track(s) found", num);
--
--	desc = toc->desc;
--	use_bcd = brasero_medium_check_BCD_use (self, fd, desc, num, code);
--	if (!use_bcd) {
--		g_free (toc);
--
--		BRASERO_BURN_LOG ("Fallback to formatted toc");
--		return BRASERO_BURN_ERR;
--	}
--
--	if (use_bcd > 0)
--		use_bcd = 0;
--
--	if (use_bcd) {
--		BRASERO_BURN_LOG ("Using BCD format");
--	}
--	else {
--		BRASERO_BURN_LOG ("Using HEX format");
--	}
--
--	for (i = 0; i < num; i++, desc ++) {
--		BraseroMediumTrack *track;
--
--		track = NULL;
--		if (desc->adr == 1 && desc->point <= BRASERO_SCSI_Q_SUB_CHANNEL_TRACK_START) {
--			track = g_new0 (BraseroMediumTrack, 1);
--			track->session = desc->session_num;
--
--			brasero_medium_set_track_type (self, track, desc->control);
--			if (use_bcd)
--				track->start = BRASERO_MSF_TO_LBA (BRASERO_GET_BCD (desc->p_min),
--								   BRASERO_GET_BCD (desc->p_sec),
--								   BRASERO_GET_BCD (desc->p_frame));
--			else
--				track->start = BRASERO_MSF_TO_LBA (desc->p_min,
--								   desc->p_sec,
--								   desc->p_frame);
--
--			track->start -= 150;
--
--			/* if there are tracks and the last previously added track is in
--			 * the same session then set the size */
--			if (priv->tracks) {
--				BraseroMediumTrack *last_track;
--
--				last_track = priv->tracks->data;
--				if (last_track->session == track->session)
--					last_track->blocks_num = track->start - last_track->start;
--			}
--
--			priv->tracks = g_slist_prepend (priv->tracks, track);
--		}
--		else if (desc->point == BRASERO_SCSI_Q_SUB_CHANNEL_LEADOUT_START) {
--			/* NOTE: the leadout session is first in the list. So if
--			 * we have tracks in the list set the last session track
--			 * size when we reach a new leadout (and therefore a new
--			 * session). */
--
--			if (priv->tracks) {
--				BraseroMediumTrack *last_track;
--
--				last_track = priv->tracks->data;
--				last_track->blocks_num = leadout_start - last_track->start;
--			}
--
--			if (use_bcd)
--				leadout_start = BRASERO_MSF_TO_LBA (BRASERO_GET_BCD (desc->p_min),
--								    BRASERO_GET_BCD (desc->p_sec),
--								    BRASERO_GET_BCD (desc->p_frame));
--			else
--				leadout_start = BRASERO_MSF_TO_LBA (desc->p_min,
--								    desc->p_sec,
--								    desc->p_frame);
--			leadout_start -= 150;
--		}
--	}
--
--	if (priv->tracks) {
--		BraseroMediumTrack *last_track;
--
--		/* set the last found track size */
--		last_track = priv->tracks->data;
--		last_track->blocks_num = leadout_start - last_track->start;
--	}
--
--	/* Add a leadout */
--	if (!(priv->info & BRASERO_MEDIUM_CLOSED)) {
--		BraseroMediumTrack *track;
--
--		/* we shouldn't request info on leadout if the disc is closed */
--		track = g_new0 (BraseroMediumTrack, 1);
--		priv->tracks = g_slist_prepend (priv->tracks, track);
--		track->start = leadout_start;
--		track->type = BRASERO_MEDIUM_TRACK_LEADOUT;
--
--		brasero_medium_track_get_info (self, track, g_slist_length (priv->tracks), fd, code); 
--	}
--
--	priv->tracks = g_slist_reverse (priv->tracks);
--
--	for (iter = priv->tracks; iter; iter = iter->next) {
--		BraseroMediumTrack *track;
--
--		track = iter->data;
--
--		/* check for tracks less that 300 sectors */
--		if (track->blocks_num <= 300 && track->type != BRASERO_MEDIUM_TRACK_LEADOUT) {
--			BRASERO_BURN_LOG ("300 sectors size. Checking for real size");
--			brasero_medium_track_volume_size (self, track, fd);
--		}
--
--		BRASERO_BURN_LOG ("Track %i: type = %i start = %llu size = %llu",
--				  g_slist_index (priv->tracks, track),
--				  track->type,
--				  track->start,
--				  track->blocks_num);
--	}
--
--	g_free (toc);
--	return BRASERO_BURN_OK;
--}
--
--/**
-- * NOTE: for DVD-R multisession we lose 28688 blocks for each session
-- * so the capacity is the addition of all session sizes + 28688 for each
-- * For all multisession DVD-/+R and CDR-RW the remaining size is given 
-- * in the leadout. One exception though with DVD+/-RW.
-- */
--
--static void
--brasero_medium_add_DVD_plus_RW_leadout (BraseroMedium *self,
--					gint32 start)
--{
--	BraseroMediumTrack *leadout;
--	BraseroMediumPrivate *priv;
--
--	priv = BRASERO_MEDIUM_PRIVATE (self);
--
--	leadout = g_new0 (BraseroMediumTrack, 1);
--	priv->tracks = g_slist_append (priv->tracks, leadout);
--
--	leadout->start = start;
--	leadout->type = BRASERO_MEDIUM_TRACK_LEADOUT;
--
--	/* we fabricate the leadout here. We don't really need one in 
--	 * fact since it is always at the last sector whatever the
--	 * amount of data written. So we need in fact to read the file
--	 * system and get the last sector from it. Hopefully it won't be
--	 * buggy */
--	priv->next_wr_add = 0;
--
--	leadout->blocks_num = priv->block_num;
--	if (g_slist_length (priv->tracks) > 1) {
--		BraseroMediumTrack *track;
--
--		track = priv->tracks->data;
--		leadout->blocks_num -= ((track->blocks_num > 300) ? track->blocks_num : 300);
--	}
--	BRASERO_BURN_LOG ("Adding fabricated leadout start = %llu length = %llu",
--			  leadout->start,
--			  leadout->blocks_num);
--}
--
--static BraseroBurnResult
--brasero_medium_get_sessions_info (BraseroMedium *self,
--				  int fd,
--				  BraseroScsiErrCode *code)
--{
--	int num, i, size;
--	BraseroScsiResult result;
--	BraseroScsiTocDesc *desc;
--	BraseroMediumPrivate *priv;
--	BraseroScsiFormattedTocData *toc = NULL;
--
--	BRASERO_BURN_LOG ("Reading Toc");
--
--	priv = BRASERO_MEDIUM_PRIVATE (self);
--	result = brasero_mmc1_read_toc_formatted (fd,
--						  0,
--						  &toc,
--						  &size,
--						  code);
--	if (result != BRASERO_SCSI_OK) {
--		g_free (toc);
--
--		BRASERO_BURN_LOG ("READ TOC failed");
--		return BRASERO_BURN_ERR;
--	}
--
--	num = (size - sizeof (BraseroScsiFormattedTocData)) /
--	       sizeof (BraseroScsiTocDesc);
--
--	BRASERO_BURN_LOG ("%i track(s) found", num);
--
--	desc = toc->desc;
--	for (i = 0; i < num; i ++, desc ++) {
--		BraseroMediumTrack *track;
--
--		if (desc->track_num == BRASERO_SCSI_TRACK_LEADOUT_START)
--			break;
--
--		track = g_new0 (BraseroMediumTrack, 1);
--		priv->tracks = g_slist_prepend (priv->tracks, track);
--		track->start = BRASERO_GET_32 (desc->track_start);
--
--		/* we shouldn't request info on a track if the disc is closed */
--		brasero_medium_track_get_info (self,
--					       track,
--					       g_slist_length (priv->tracks),
--					       fd,
--					       code);
--
--		if (desc->control & BRASERO_SCSI_TRACK_COPY)
--			track->type |= BRASERO_MEDIUM_TRACK_COPY;
--
--		if (!(desc->control & BRASERO_SCSI_TRACK_DATA)) {
--			track->type |= BRASERO_MEDIUM_TRACK_AUDIO;
--			priv->info |= BRASERO_MEDIUM_HAS_AUDIO;
--
--			if (desc->control & BRASERO_SCSI_TRACK_PREEMP)
--				track->type |= BRASERO_MEDIUM_TRACK_PREEMP;
--
--			if (desc->control & BRASERO_SCSI_TRACK_4_CHANNELS)
--				track->type |= BRASERO_MEDIUM_TRACK_4_CHANNELS;
--		}
--		else if (BRASERO_MEDIUM_IS (priv->info, BRASERO_MEDIUM_DVDRW_PLUS)
--		     ||  BRASERO_MEDIUM_IS (priv->info, BRASERO_MEDIUM_DVDRW_RESTRICTED)) {
--			BraseroBurnResult result;
--
--			/* a special case for these two kinds of media (DVD+RW)
--			 * which have only one track: the first. */
--			result = brasero_medium_track_volume_size (self, 
--								   track,
--								   fd);
--			if (result == BRASERO_BURN_OK) {
--				track->type |= BRASERO_MEDIUM_TRACK_DATA;
--				priv->info |= BRASERO_MEDIUM_HAS_DATA;
--
--				priv->next_wr_add = 0;
--
--				if (desc->control & BRASERO_SCSI_TRACK_DATA_INCREMENTAL)
--					track->type |= BRASERO_MEDIUM_TRACK_INCREMENTAL;
--			}
--			else {
--				priv->tracks = g_slist_remove (priv->tracks, track);
--				g_free (track);
--
--				priv->info |= BRASERO_MEDIUM_BLANK;
--				priv->info &= ~BRASERO_MEDIUM_CLOSED;
--			}
--		}
--		else {
--			track->type |= BRASERO_MEDIUM_TRACK_DATA;
--			priv->info |= BRASERO_MEDIUM_HAS_DATA;
--
--			if (desc->control & BRASERO_SCSI_TRACK_DATA_INCREMENTAL)
--				track->type |= BRASERO_MEDIUM_TRACK_INCREMENTAL;
--		}
--	}
--
--	/* put the tracks in the right order */
--	priv->tracks = g_slist_reverse (priv->tracks);
--
--	if (BRASERO_MEDIUM_IS (priv->info, BRASERO_MEDIUM_DVDRW_PLUS)
--	||  BRASERO_MEDIUM_IS (priv->info, BRASERO_MEDIUM_DVDRW_RESTRICTED))
--		brasero_medium_add_DVD_plus_RW_leadout (self, BRASERO_GET_32 (desc->track_start));
--	else if (!(priv->info & BRASERO_MEDIUM_CLOSED)) {
--		BraseroMediumTrack *track;
--
--		/* we shouldn't request info on leadout if the disc is closed
--		 * (except for DVD+/- (restricted) RW (see above) */
--		track = g_new0 (BraseroMediumTrack, 1);
--		priv->tracks = g_slist_append (priv->tracks, track);
--		track->start = BRASERO_GET_32 (desc->track_start);
--		track->type = BRASERO_MEDIUM_TRACK_LEADOUT;
--
--		brasero_medium_track_get_info (self,
--					       track,
--					       g_slist_length (priv->tracks),
--					       fd,
--					       code);
--	}
--
--	g_free (toc);
--
--	return BRASERO_BURN_OK;
--}
--
--static BraseroBurnResult
--brasero_medium_get_contents (BraseroMedium *self,
--			     int fd,
--			     BraseroScsiErrCode *code)
--{
--	int size;
--	BraseroScsiResult result;
--	BraseroMediumPrivate *priv;
--	BraseroScsiDiscInfoStd *info = NULL;
--
--	BRASERO_BURN_LOG ("Retrieving media status");
--
--	priv = BRASERO_MEDIUM_PRIVATE (self);
--
--	result = brasero_mmc1_read_disc_information_std (fd,
--							 &info,
--							 &size,
--							 code);
--	if (result != BRASERO_SCSI_OK) {
--		g_free (info);
--	
--		BRASERO_BURN_LOG ("READ DISC INFORMATION failed");
--		return BRASERO_BURN_ERR;
--	}
--
--	if (info->erasable)
--		priv->info |= BRASERO_MEDIUM_REWRITABLE;
--
--	if (info->status == BRASERO_SCSI_DISC_EMPTY) {
--		BraseroMediumTrack *track;
--
--		BRASERO_BURN_LOG ("Empty media");
--
--		priv->info |= BRASERO_MEDIUM_BLANK;
--		priv->block_size = 2048;
--
--		if (BRASERO_MEDIUM_IS (priv->info, BRASERO_MEDIUM_DVDRW_PLUS)
--		||  BRASERO_MEDIUM_IS (priv->info, BRASERO_MEDIUM_DVDRW_RESTRICTED))
--			brasero_medium_add_DVD_plus_RW_leadout (self, 0);
--		else {
--			track = g_new0 (BraseroMediumTrack, 1);
--			track->start = 0;
--			track->type = BRASERO_MEDIUM_TRACK_LEADOUT;
--			priv->tracks = g_slist_prepend (priv->tracks, track);
--			
--			brasero_medium_track_get_info (self,
--						       track,
--						       1,
--						       fd,
--						       code);
--		}
--		goto end;
--	}
--
--	if (info->status == BRASERO_SCSI_DISC_INCOMPLETE) {
--		priv->info |= BRASERO_MEDIUM_APPENDABLE;
--		BRASERO_BURN_LOG ("Appendable media");
--	}
--	else if (info->status == BRASERO_SCSI_DISC_FINALIZED) {
--		priv->info |= BRASERO_MEDIUM_CLOSED;
--		BRASERO_BURN_LOG ("Closed media");
--	}
--
--	if (priv->info & BRASERO_MEDIUM_CD) {
--		result = brasero_medium_get_CD_sessions_info (self, fd, code);
--		if (result != BRASERO_BURN_OK)
--			result = brasero_medium_get_sessions_info (self, fd, code);
--	}
--	else
--		result = brasero_medium_get_sessions_info (self, fd, code);
--
--	if (result != BRASERO_BURN_OK)
--		goto end;
--
--end:
--
--	g_free (info);
--	return BRASERO_BURN_OK;
--}
--
--static void
--brasero_medium_init_real (BraseroMedium *object, int fd)
--{
--	gchar *name;
--	BraseroBurnResult result;
--	BraseroMediumPrivate *priv;
--	BraseroScsiErrCode code = 0;
--
--	priv = BRASERO_MEDIUM_PRIVATE (object);
--
--	name = nautilus_burn_drive_get_name_for_display (priv->drive);
--	BRASERO_BURN_LOG ("Initializing information for medium in %s", name);
--	g_free (name);
--
--	result = brasero_medium_get_medium_type (object, fd, &code);
--	if (result != BRASERO_BURN_OK)
--		return;
--
--	brasero_medium_get_capacity_by_type (object, fd, &code);
--
--	result = brasero_medium_get_contents (object, fd, &code);
--	if (result != BRASERO_BURN_OK)
--		return;
--
--	/* assume that css feature is only for DVD-ROM which might be wrong but
--	 * some drives wrongly reports that css is enabled for blank DVD+R/W */
--	if (BRASERO_MEDIUM_IS (priv->info, (BRASERO_MEDIUM_DVD|BRASERO_MEDIUM_ROM)))
--		brasero_medium_get_css_feature (object, fd, &code);
--
--	BRASERO_BURN_LOG_DISC_TYPE (priv->info, "media is ");
--}
--
--static gboolean
--brasero_medium_retry_open (gpointer object)
--{
--	int fd;
--	const gchar *path;
--	BraseroMedium *self;
--	BraseroMediumPrivate *priv;
--
--	self = BRASERO_MEDIUM (object);
--	priv = BRASERO_MEDIUM_PRIVATE (object);
--	path = nautilus_burn_drive_get_device (priv->drive);
--
--	BRASERO_BURN_LOG ("Retrying to open device %s", path);
--	fd = open (path, OPEN_FLAGS);
--	if (fd < 0) {
--		if (errno == EBUSY
--		||  errno == EAGAIN
--		||  errno == EWOULDBLOCK) {
--			BRASERO_BURN_LOG ("Device busy");
--			/* we'll retry in a second */
--			return TRUE;
--		}
--
--		BRASERO_BURN_LOG ("Open () failed");
--		priv->info = BRASERO_MEDIUM_UNSUPPORTED;
--		priv->retry_id = 0;
--		return FALSE;
--	}
--
--	BRASERO_BURN_LOG ("Open () succeeded\n");
--	priv->info = BRASERO_MEDIUM_NONE;
--	priv->icon = icons [0];
--
--	priv->retry_id = 0;
--
--	brasero_medium_init_real (self, fd);
--	close (fd);
--
--	return FALSE;
--}
--
--static void
--brasero_medium_try_open (BraseroMedium *self)
--{
--	int fd;
--	const gchar *path;
--	BraseroMediumPrivate *priv;
--
--	priv = BRASERO_MEDIUM_PRIVATE (self);
--	path = nautilus_burn_drive_get_device (priv->drive);
--
--	/* the drive might be busy (a burning is going on) so we don't block
--	 * but we re-try to open it every second */
--	BRASERO_BURN_LOG ("Trying to open device %s", path);
--	fd = open (path, OPEN_FLAGS);
--	if (fd < 0) {
--		if (errno == EAGAIN
--		||  errno == EWOULDBLOCK
--		||  errno == EBUSY) {
--			BRASERO_BURN_LOG ("Device busy");
--			priv->info = BRASERO_MEDIUM_BUSY;
--			priv->icon = icons [0];
--
--			priv->retry_id = g_timeout_add (BUSY_RETRY_TIME,
--							brasero_medium_retry_open,
--							self);
--		}
--
--		BRASERO_BURN_LOG ("Open () failed");
--		return;
--	}
--
--	BRASERO_BURN_LOG ("Open () succeeded");
--	brasero_medium_init_real (self, fd);
--	close (fd);
--}
--
--static void
--brasero_medium_init (BraseroMedium *object)
--{
--	BraseroMediumPrivate *priv;
--
--	priv = BRASERO_MEDIUM_PRIVATE (object);
--	priv->next_wr_add = -1;
--
--	/* we can't do anything here since properties haven't been set yet */
--}
--
--static void
--brasero_medium_finalize (GObject *object)
--{
--	BraseroMediumPrivate *priv;
--
--	priv = BRASERO_MEDIUM_PRIVATE (object);
--
--	if (priv->retry_id) {
--		g_source_remove (priv->retry_id);
--		priv->retry_id = 0;
--	}
--
--	g_free (priv->rd_speeds);
--	priv->rd_speeds = NULL;
--
--	g_free (priv->wr_speeds);
--	priv->wr_speeds = NULL;
--
--	g_slist_foreach (priv->tracks, (GFunc) g_free, NULL);
--	g_slist_free (priv->tracks);
--	priv->tracks = NULL;
--
--	nautilus_burn_drive_unref (priv->drive);
--	priv->drive = NULL;
--
--	G_OBJECT_CLASS (parent_class)->finalize (object);
--}
--
--static void
--brasero_medium_set_property (GObject *object, guint prop_id, const GValue *value, GParamSpec *pspec)
--{
--	BraseroMediumPrivate *priv;
--
--	g_return_if_fail (BRASERO_IS_MEDIUM (object));
--
--	priv = BRASERO_MEDIUM_PRIVATE (object);
--
--	switch (prop_id)
--	{
--	case PROP_DRIVE:
--		priv->drive = g_value_get_object (value);
--		nautilus_burn_drive_ref (priv->drive);
--		brasero_medium_try_open (BRASERO_MEDIUM (object));
--		break;
--	default:
--		G_OBJECT_WARN_INVALID_PROPERTY_ID (object, prop_id, pspec);
--		break;
--	}
--}
--
--static void
--brasero_medium_get_property (GObject *object, guint prop_id, GValue *value, GParamSpec *pspec)
--{
--	BraseroMediumPrivate *priv;
--
--	g_return_if_fail (BRASERO_IS_MEDIUM (object));
--
--	priv = BRASERO_MEDIUM_PRIVATE (object);
--
--	switch (prop_id)
--	{
--	case PROP_DRIVE:
--		nautilus_burn_drive_ref (priv->drive);
--		g_value_set_object (value, priv->drive);
--		break;
--	default:
--		G_OBJECT_WARN_INVALID_PROPERTY_ID (object, prop_id, pspec);
--		break;
--	}
--}
--
--static void
--brasero_medium_class_init (BraseroMediumClass *klass)
--{
--	GObjectClass* object_class = G_OBJECT_CLASS (klass);
--	parent_class = G_OBJECT_CLASS (g_type_class_peek_parent (klass));
--
--	g_type_class_add_private (klass, sizeof (BraseroMediumPrivate));
--
--	object_class->finalize = brasero_medium_finalize;
--	object_class->set_property = brasero_medium_set_property;
--	object_class->get_property = brasero_medium_get_property;
--
--	g_object_class_install_property (object_class,
--	                                 PROP_DRIVE,
--	                                 g_param_spec_object ("drive",
--	                                                      "drive",
--	                                                      "drive in which medium is inserted",
--	                                                      NAUTILUS_BURN_TYPE_DRIVE,
--	                                                      G_PARAM_READWRITE | G_PARAM_CONSTRUCT_ONLY));
--}
--
--GType
--brasero_medium_get_type (void)
--{
--	static GType our_type = 0;
--
--	if (our_type == 0)
--	{
--		static const GTypeInfo our_info =
--		{
--			sizeof (BraseroMediumClass), /* class_size */
--			(GBaseInitFunc) NULL, /* base_init */
--			(GBaseFinalizeFunc) NULL, /* base_finalize */
--			(GClassInitFunc) brasero_medium_class_init, /* class_init */
--			(GClassFinalizeFunc) NULL, /* class_finalize */
--			NULL /* class_data */,
--			sizeof (BraseroMedium), /* instance_size */
--			0, /* n_preallocs */
--			(GInstanceInitFunc) brasero_medium_init, /* instance_init */
--			NULL /* value_table */
--		};
--
--		our_type = g_type_register_static (G_TYPE_OBJECT, "BraseroMedium",
--		                                   &our_info, 0);
--	}
--
--	return our_type;
--}
--
--BraseroMedium *
--brasero_medium_new (NautilusBurnDrive *drive)
--{
--	g_return_val_if_fail (drive != NULL, NULL);
--	return BRASERO_MEDIUM (g_object_new (BRASERO_TYPE_MEDIUM,
--					     "drive", drive,
--					     NULL));
--}
diff --git a/sysutils/brasero/files/patch-src_cam b/sysutils/brasero/files/patch-src_cam
deleted file mode 100644
index 7e8be77e7..000000000
--- a/sysutils/brasero/files/patch-src_cam
+++ /dev/null
@@ -1,1361 +0,0 @@
-diff -rupN cam.orig/freebsd_dvd_rw_utils.h cam/freebsd_dvd_rw_utils.h
---- /dev/null	1969-12-31 19:00:00.000000000 -0500
-+++ src/cam/freebsd_dvd_rw_utils.h	2008-01-24 16:52:25.000000000 -0500
-@@ -0,0 +1,49 @@
-+//
-+// This is part of dvd+rw-tools by Andy Polyakov <appro@fy.chalmers.se>
-+//
-+// Use-it-on-your-own-risk, GPL bless...
-+//
-+// For further details see http://fy.chalmers.se/~appro/linux/DVD+RW/
-+//
-+
-+#ifndef FREEBSD_DVD_RW_UTILS_H
-+#define FREEBSD_DVD_RW_UTILS_H
-+
-+#ifdef HAVE_CONFIG_H
-+#  include <config.h>
-+#endif
-+
-+#include <glib.h>
-+
-+#include "cam-cdrom.h"
-+
-+#define DRIVE_CDROM_CAPS_DVDRW		1
-+#define DRIVE_CDROM_CAPS_DVDPLUSR	2
-+#define DRIVE_CDROM_CAPS_DVDPLUSRW	4
-+#define DRIVE_CDROM_CAPS_DVDPLUSRWDL	8
-+#define DRIVE_CDROM_CAPS_DVDPLUSRDL	16
-+#define DRIVE_CDROM_CAPS_BDROM		32
-+#define DRIVE_CDROM_CAPS_BDR		64
-+#define DRIVE_CDROM_CAPS_BDRE		128
-+#define DRIVE_CDROM_CAPS_HDDVDROM	256
-+#define DRIVE_CDROM_CAPS_HDDVDR		512
-+#define DRIVE_CDROM_CAPS_HDDVDRW	1024
-+
-+int brasero_cdrom_get_dvd_r_rw_profile (BRASEROCDROM *cdrom);
-+int brasero_cdrom_get_read_write_speed (BRASEROCDROM *cdrom, int *read_speed, int *write_speed, char **write_speeds);
-+int brasero_cdrom_get_disc_capacity_for_type (BRASEROCDROM *cdrom, int type, guint64 *capacity);
-+int brasero_cdrom_get_disc_type (BRASEROCDROM *cdrom);
-+int brasero_cdrom_read_disc_information_std (BRASEROCDROM *cdrom, unsigned char *buf);
-+int brasero_cdrom_disc_is_appendable (BRASEROCDROM *cdrom);
-+int brasero_cdrom_disc_is_rewritable (BRASEROCDROM *cdrom);
-+int brasero_cdrom_read_atip (BRASEROCDROM *cdrom, unsigned char **buf);
-+int brasero_cdrom_read_format_capacities (BRASEROCDROM *cdrom, unsigned char **buf);
-+int brasero_cdrom_get_performance_wrt_spd_desc (BRASEROCDROM *cdrom, unsigned char **buf);
-+int brasero_cdrom_get_configuration_feature (BRASEROCDROM *cdrom, int feature, unsigned char **buf);
-+int brasero_cdrom_read_track_info (BRASEROCDROM *cdrom, int track_num, unsigned char *buf, int size);
-+int brasero_cdrom_read_toc_raw (BRASEROCDROM *cdrom, int track_num, unsigned char **buf);
-+int brasero_cdrom_read_toc_formatted (BRASEROCDROM *cdrom, int track_num, unsigned char **buf);
-+int brasero_read_disc_information_std (BRASEROCDROM *cdrom, unsigned char *buf);
-+int brasero_cdrom_read_format_capacities (BRASEROCDROM *cdrom, unsigned char **buf);
-+
-+#endif				/* FREEBSD_DVD_RW_UTILS_H */
---- /dev/null	2008-02-03 02:26:39.000000000 -0500
-+++ src/cam/cam-cdrom.h	2008-02-03 11:32:23.000000000 -0500
-@@ -0,0 +1,68 @@
-+/***************************************************************************
-+ * CVSID: $Id: patch-src_cam,v 1.1 2008-02-06 07:09:50 marcus Exp $
-+ *
-+ * hfp-cdrom.h : SCSI CD-ROM abstraction layer
-+ *
-+ * Copyright (C) 2006 Jean-Yves Lefort <jylefort@FreeBSD.org>
-+ *
-+ * This program is free software; you can redistribute it and/or modify
-+ * it under the terms of the GNU General Public License as published by
-+ * the Free Software Foundation; either version 2 of the License, or
-+ * (at your option) any later version.
-+ *
-+ * This program is distributed in the hope that it will be useful,
-+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
-+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-+ * GNU General Public License for more details.
-+ *
-+ * You should have received a copy of the GNU General Public License
-+ * along with this program; if not, write to the Free Software
-+ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
-+ *
-+ **************************************************************************/
-+
-+#ifndef _BRASERO_CDROM_H
-+#define _BRASERO_CDROM_H
-+
-+#ifdef HAVE_CONFIG_H
-+#  include <config.h>
-+#endif
-+
-+#include <glib.h>
-+
-+#include <sys/types.h>
-+
-+typedef struct _BRASEROCDROM BRASEROCDROM;
-+
-+typedef enum
-+{
-+  BRASERO_CDROM_DIRECTION_NONE,
-+  BRASERO_CDROM_DIRECTION_IN,
-+  BRASERO_CDROM_DIRECTION_OUT
-+} BRASEROCDROMDirection;
-+
-+/* ATAPI/SCSI commands */
-+enum
-+{
-+  BRASERO_CDROM_TEST_UNIT_READY			= 0x00,
-+  BRASERO_CDROM_GET_EVENT_STATUS_NOTIFICATION	= 0x4a,
-+  BRASERO_CDROM_MODE_SENSE_BIG			= 0x5a
-+};
-+
-+BRASEROCDROM *brasero_cdrom_new (const char *path);
-+
-+gboolean brasero_cdrom_send_ccb (BRASEROCDROM *cdrom,
-+			    const char *ccb,
-+			    int ccb_len,
-+			    BRASEROCDROMDirection direction,
-+			    void *data,
-+			    int len,
-+			    char **err);
-+
-+gboolean brasero_cdrom_test_unit_ready (BRASEROCDROM *cdrom);
-+
-+int brasero_cdrom_get_fd (BRASEROCDROM *cdrom);
-+
-+void brasero_cdrom_free (BRASEROCDROM *cdrom);
-+
-+#endif /* _BRASERO_CDROM_H */
---- /dev/null	2008-02-03 13:11:45.000000000 -0500
-+++ src/cam/cam-cdrom.c	2008-02-03 13:24:53.000000000 -0500
-@@ -0,0 +1,156 @@
-+/***************************************************************************
-+ * CVSID: $Id: patch-src_cam,v 1.1 2008-02-06 07:09:50 marcus Exp $
-+ *
-+ * cam-cdrom.c : SCSI CD-ROM abstraction layer
-+ *
-+ * Copyright (C) 2006 Jean-Yves Lefort <jylefort@FreeBSD.org>
-+ *
-+ * This program is free software; you can redistribute it and/or modify
-+ * it under the terms of the GNU General Public License as published by
-+ * the Free Software Foundation; either version 2 of the License, or
-+ * (at your option) any later version.
-+ *
-+ * This program is distributed in the hope that it will be useful,
-+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
-+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-+ * GNU General Public License for more details.
-+ *
-+ * You should have received a copy of the GNU General Public License
-+ * along with this program; if not, write to the Free Software
-+ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
-+ *
-+ **************************************************************************/
-+
-+#ifdef HAVE_CONFIG_H
-+#  include <config.h>
-+#endif
-+
-+#include <string.h>
-+#include <errno.h>
-+#include <fcntl.h>
-+#include <unistd.h>
-+#include <sys/ioctl.h>
-+#include <sys/types.h>
-+#include <sys/ata.h>
-+#include <stdio.h>
-+#include <camlib.h>
-+#include <cam/scsi/scsi_message.h>
-+#include <glib.h>
-+
-+#include "cam-cdrom.h"
-+
-+struct _BRASEROCDROM
-+{
-+  struct cam_device	*cam;		/* for SCSI drives */
-+  int                    fd;
-+};
-+
-+BRASEROCDROM *
-+brasero_cdrom_new (const char *path)
-+{
-+  BRASEROCDROM *cdrom = NULL;
-+  struct cam_device *cam;
-+  int fd;
-+
-+  g_assert(path != NULL);
-+
-+  /* brasero_open_device() fails unless we use O_RDWR */
-+  cam = cam_open_device(path, O_RDWR);
-+  fd = open(path, O_RDONLY | O_NONBLOCK);
-+  if (cam && fd > -1)
-+    {
-+      cdrom = g_new0(BRASEROCDROM, 1);
-+      cdrom->cam = cam;
-+      cdrom->fd = fd;
-+    }
-+
-+  return cdrom;
-+}
-+
-+gboolean
-+brasero_cdrom_send_ccb (BRASEROCDROM *cdrom,
-+		    const char *ccb,
-+		    int ccb_len,
-+		    BRASEROCDROMDirection direction,
-+		    void *data,
-+		    int len,
-+		    char **err)
-+{
-+  int timeout;
-+
-+  g_assert(cdrom != NULL);
-+  g_assert(ccb != NULL);
-+  g_assert(direction == BRASERO_CDROM_DIRECTION_NONE
-+	 || direction == BRASERO_CDROM_DIRECTION_IN
-+	 || direction == BRASERO_CDROM_DIRECTION_OUT);
-+  g_assert(direction == BRASERO_CDROM_DIRECTION_NONE || data != NULL);
-+
-+  timeout = 10;
-+
-+  union ccb cam_ccb;
-+  static int scsi_direction[] = { CAM_DIR_NONE, CAM_DIR_IN, CAM_DIR_OUT };
-+
-+  memset(&cam_ccb, 0, sizeof(cam_ccb));
-+
-+  cam_ccb.ccb_h.path_id = cdrom->cam->path_id;
-+  cam_ccb.ccb_h.target_id = cdrom->cam->target_id;
-+  cam_ccb.ccb_h.target_lun = cdrom->cam->target_lun;
-+
-+  cam_fill_csio(&cam_ccb.csio,
-+		1,
-+		NULL,
-+		scsi_direction[direction],
-+		MSG_SIMPLE_Q_TAG,
-+		data,
-+		len,
-+		sizeof(cam_ccb.csio.sense_data),
-+		ccb_len,
-+		timeout * 1000);
-+
-+  memcpy(cam_ccb.csio.cdb_io.cdb_bytes, ccb, 16);
-+
-+  if (cam_send_ccb(cdrom->cam, &cam_ccb) == -1)
-+    {
-+      if (err)
-+        *err = g_strdup_printf("cam_send_ccb() failure: %s", g_strerror(errno));
-+    }
-+  if ((cam_ccb.ccb_h.status & CAM_STATUS_MASK) != CAM_REQ_CMP)
-+    {
-+      if (err)
-+        *err = g_strdup_printf("CCB request failed with status %i", cam_ccb.ccb_h.status & CAM_STATUS_MASK);
-+      return FALSE;
-+    }
-+
-+  return TRUE;
-+}
-+
-+gboolean
-+brasero_cdrom_test_unit_ready (BRASEROCDROM *cdrom)
-+{
-+  static char ccb[16] = { BRASERO_CDROM_TEST_UNIT_READY };
-+
-+  g_assert(cdrom != NULL);
-+
-+  return brasero_cdrom_send_ccb(cdrom, ccb, 6, BRASERO_CDROM_DIRECTION_NONE, NULL, 0, NULL);
-+}
-+
-+int
-+brasero_cdrom_get_fd (BRASEROCDROM *cdrom)
-+{
-+  g_assert(cdrom != NULL);
-+
-+  return (cdrom->fd);
-+}
-+
-+void
-+brasero_cdrom_free (BRASEROCDROM *cdrom)
-+{
-+  g_assert(cdrom != NULL);
-+
-+  if (cdrom->cam)
-+    cam_close_device(cdrom->cam);
-+
-+  close(cdrom->fd);
-+
-+  g_free(cdrom);
-+}
---- /dev/null	2008-02-03 13:11:45.000000000 -0500
-+++ src/cam/freebsd_dvd_rw_utils.c	2008-02-03 13:30:36.000000000 -0500
-@@ -0,0 +1,1075 @@
-+/* -*- Mode: C; indent-tabs-mode: t; c-basic-offset: 8; tab-width: 8 -*-
-+ *
-+ * This is part of dvd+rw-tools by Andy Polyakov <appro@fy.chalmers.se>
-+ *
-+ * Use-it-on-your-own-risk, GPL bless...
-+ *
-+ * For further details see http://fy.chalmers.se/~appro/linux/DVD+RW/
-+*/
-+
-+#include <stdio.h>
-+#include <string.h>
-+#include <stdlib.h>
-+#include <sys/types.h>
-+
-+#include <glib.h>
-+
-+#include "freebsd_dvd_rw_utils.h"
-+
-+typedef enum {
-+	NONE = BRASERO_CDROM_DIRECTION_NONE,
-+	READ = BRASERO_CDROM_DIRECTION_IN,
-+	WRITE = BRASERO_CDROM_DIRECTION_OUT
-+} Direction;
-+
-+typedef struct ScsiCommand ScsiCommand;
-+
-+struct ScsiCommand {
-+	BRASEROCDROM		*cdrom;
-+	char			ccb[16];
-+	int			len;
-+};
-+
-+static ScsiCommand *
-+scsi_command_new_from_cdrom (BRASEROCDROM *cdrom)
-+{
-+	ScsiCommand *cmd;
-+
-+	cmd = g_new0 (ScsiCommand, 1);
-+	cmd->cdrom = cdrom;
-+
-+	return cmd;
-+}
-+
-+static void
-+scsi_command_free (ScsiCommand * cmd)
-+{
-+	free (cmd);
-+}
-+
-+static void
-+scsi_command_init (ScsiCommand * cmd, size_t i, int arg)
-+{
-+	cmd->ccb[i] = arg;
-+	if (i == 0 || i >= cmd->len)
-+		cmd->len = i + 1;
-+}
-+
-+static int
-+scsi_command_transport (ScsiCommand * cmd, Direction dir, void *buf,
-+			size_t sz)
-+{
-+	if (brasero_cdrom_send_ccb(cmd->cdrom, cmd->ccb, cmd->len, dir, buf, sz, NULL))
-+		return 0;
-+	else
-+		return -1;
-+}
-+
-+int
-+brasero_cdrom_get_dvd_r_rw_profile (BRASEROCDROM *cdrom)
-+{
-+	ScsiCommand *cmd;
-+	int retval = 0;
-+	unsigned char page[20];
-+	unsigned char *list;
-+	int i, len;
-+
-+	g_return_val_if_fail (cdrom != NULL, -1);
-+
-+	cmd = scsi_command_new_from_cdrom (cdrom);
-+
-+	scsi_command_init (cmd, 0, 0x46);
-+	scsi_command_init (cmd, 1, 2);
-+	scsi_command_init (cmd, 8, 8);
-+	scsi_command_init (cmd, 9, 0);
-+	if (scsi_command_transport (cmd, READ, page, 8)) {
-+		/* GET CONFIGURATION failed */
-+		scsi_command_free (cmd);
-+		return -1;
-+	}
-+
-+	/* See if it's 2 gen drive by checking if DVD+R profile is an option */
-+	len = 4 + (page[0] << 24 | page[1] << 16 | page[2] << 8 | page[3]);
-+	if (len > 264) {
-+		scsi_command_free (cmd);
-+		/* insane profile list length */
-+		return -1;
-+	}
-+
-+	list = g_new (unsigned char, len);
-+
-+	scsi_command_init (cmd, 0, 0x46);
-+	scsi_command_init (cmd, 1, 2);
-+	scsi_command_init (cmd, 7, len >> 8);
-+	scsi_command_init (cmd, 8, len);
-+	scsi_command_init (cmd, 9, 0);
-+	if (scsi_command_transport (cmd, READ, list, len)) {
-+		/* GET CONFIGURATION failed */
-+		scsi_command_free (cmd);
-+		free (list);
-+		return -1;
-+	}
-+
-+	for (i = 12; i < list[11]; i += 4) {
-+		int profile = (list[i] << 8 | list[i + 1]);
-+		/* 0x13: DVD-RW Restricted Overwrite
-+		 * 0x14: DVD-RW Sequential
-+		 * 0x1B: DVD+R
-+		 * 0x1A: DVD+RW
-+		 * 0x2A: DVD+RW DL
-+		 * 0x2B: DVD+R DL
-+		 * 0x40: BD-ROM
-+		 * 0x41: BD-R SRM
-+		 * 0x42: BD-R RRM
-+		 * 0x43: BD-RE
-+		 * 0x50: HD DVD-ROM
-+		 * 0x51: HD DVD-R
-+		 * 0x52: HD DVD-Rewritable
-+		 */
-+
-+		switch (profile) {
-+			case 0x13:
-+			case 0x14:
-+				retval |= DRIVE_CDROM_CAPS_DVDRW;
-+				break;
-+			case 0x1B:
-+				retval |= DRIVE_CDROM_CAPS_DVDPLUSR;
-+				break;
-+			case 0x1A:
-+				retval |= DRIVE_CDROM_CAPS_DVDPLUSRW;
-+				break;
-+			case 0x2A:
-+				retval |= DRIVE_CDROM_CAPS_DVDPLUSRWDL;
-+				break;
-+			case 0x2B:
-+				retval |= DRIVE_CDROM_CAPS_DVDPLUSRDL;
-+				break;
-+			case 0x40:
-+				retval |= DRIVE_CDROM_CAPS_BDROM;
-+				break;
-+			case 0x41:
-+			case 0x42:
-+				retval |= DRIVE_CDROM_CAPS_BDR;
-+				break;
-+			case 0x43:
-+				retval |= DRIVE_CDROM_CAPS_BDRE;
-+				break;
-+			case 0x50:
-+				retval |= DRIVE_CDROM_CAPS_HDDVDROM;
-+				break;
-+			case 0x51:
-+				retval |= DRIVE_CDROM_CAPS_HDDVDR;
-+				break;
-+			case 0x52:
-+				retval |= DRIVE_CDROM_CAPS_HDDVDRW;
-+				break;
-+			default:
-+				break;
-+		}
-+	}
-+
-+	scsi_command_free (cmd);
-+	free (list);
-+
-+	return retval;
-+
-+}
-+
-+static unsigned char *
-+pull_page2a_from_cdrom (BRASEROCDROM *cdrom)
-+{
-+	ScsiCommand *cmd;
-+	unsigned char header[12], *page2A;
-+	unsigned int len, bdlen;
-+
-+	g_return_val_if_fail (cdrom != NULL, NULL);
-+
-+	cmd = scsi_command_new_from_cdrom (cdrom);
-+
-+	scsi_command_init (cmd, 0, 0x5A);	/* MODE SENSE */
-+	scsi_command_init (cmd, 1, 0x08);	/* Disable Block Descriptors */
-+	scsi_command_init (cmd, 2, 0x2A);	/* Capabilities and Mechanical Status */
-+	scsi_command_init (cmd, 8, sizeof (header));	/* header only to start with */
-+	scsi_command_init (cmd, 9, 0);
-+
-+	if (scsi_command_transport (cmd, READ, header, sizeof (header))) {
-+		/* MODE SENSE failed */
-+		scsi_command_free (cmd);
-+		return NULL;
-+	}
-+
-+	len = (header[0] << 8 | header[1]) + 2;
-+	bdlen = header[6] << 8 | header[7];
-+
-+	/* should never happen as we set "DBD" above */
-+	if (bdlen) {
-+		if (len < (8 + bdlen + 30)) {
-+			/* LUN impossible to bear with */
-+			scsi_command_free (cmd);
-+			return NULL;
-+		}
-+	} else if (len < (8 + 2 + (unsigned int) header[9])) {
-+		/* SANYO does this. */
-+		len = 8 + 2 + header[9];
-+	}
-+
-+	page2A = g_new (unsigned char, len);
-+	if (page2A == NULL) {
-+		/* ENOMEM */
-+		scsi_command_free (cmd);
-+		return NULL;
-+	}
-+
-+	scsi_command_init (cmd, 0, 0x5A);	/* MODE SENSE */
-+	scsi_command_init (cmd, 1, 0x08);	/* Disable Block Descriptors */
-+	scsi_command_init (cmd, 2, 0x2A);	/* Capabilities and Mechanical Status */
-+	scsi_command_init (cmd, 7, len >> 8);
-+	scsi_command_init (cmd, 8, len);	/* Real length */
-+	scsi_command_init (cmd, 9, 0);
-+	if (scsi_command_transport (cmd, READ, page2A, len)) {
-+		/* MODE SENSE failed */
-+		scsi_command_free (cmd);
-+		free (page2A);
-+		return NULL;
-+	}
-+
-+	scsi_command_free (cmd);
-+
-+	len -= 2;
-+	/* paranoia */
-+	if (len < ((unsigned int) page2A[0] << 8 | page2A[1])) {
-+		page2A[0] = len >> 8;
-+		page2A[1] = len;
-+	}
-+
-+	return page2A;
-+}
-+
-+static int
-+int_compare (const void *a, const void *b)
-+{
-+	/* descending order */
-+	return *((int *) b) - *((int *) a);
-+}
-+
-+/* gets the list of supported write speeds.  in the event
-+ * that anything goes wrong, returns NULL.
-+ */
-+static char *
-+get_write_speeds (const unsigned char *p, int length, int max_speed)
-+{
-+	char *result, *str;
-+	int nr_records;
-+	int *tmpspeeds;
-+	int i, j;
-+
-+	result = NULL;
-+
-+	/* paranoia */
-+	if (length < 32)
-+		return NULL;
-+
-+	nr_records = p[30] << 8 | p[31];
-+
-+	/* paranoia */
-+	if (length < 32 + 4 * nr_records)
-+		return NULL;
-+
-+	tmpspeeds = g_new (int, nr_records);
-+
-+	for (i = 0; i < nr_records; i++)
-+	{
-+		tmpspeeds[i] = p[4*i + 34] << 8 | p[4*i + 35];
-+
-+		/* i'm not sure how likely this is to show up, but it's
-+		 * definitely wrong.  if we see it, abort.
-+		 */
-+		if (tmpspeeds[i] == 0)
-+			goto free_tmpspeeds;
-+	}
-+
-+	/* sort */
-+	qsort (tmpspeeds, nr_records, sizeof (int), int_compare);
-+
-+	/* uniq */
-+	for (i = j = 0; i < nr_records; i++)
-+	{
-+		tmpspeeds[j] = tmpspeeds[i];
-+
-+		/* make sure we don't look past the end of the array */
-+		if (i >= (nr_records - 1) || tmpspeeds[i+1] != tmpspeeds[i])
-+			j++;
-+	}
-+
-+	/* j is now the number of unique entries in the array */
-+	if (j == 0)
-+		/* no entries?  this isn't right. */
-+		goto free_tmpspeeds;
-+
-+	/* sanity check: the first item in the descending order
-+	 * list ought to be the highest speed as detected through
-+	 * other means
-+	 */
-+	if (tmpspeeds[0] != max_speed)
-+		/* sanity check failed. */
-+		goto free_tmpspeeds;
-+
-+	/* our values are 16-bit.  8 bytes per value
-+	 * is more than enough including space for
-+	 * ',' and '\0'.  we know j is not zero.
-+	 */
-+	result = str = g_new (char, 8 * j);
-+
-+	for (i = 0; i < j; i++)
-+	{
-+		if (i > 0)
-+			*(str++) = ',';
-+
-+		str += sprintf (str, "%d", tmpspeeds[i]);
-+	}
-+
-+free_tmpspeeds:
-+	free (tmpspeeds);
-+
-+	return result;
-+}
-+
-+int
-+brasero_cdrom_get_read_write_speed (BRASEROCDROM *cdrom, int *read_speed, int *write_speed, char **write_speeds)
-+{
-+	unsigned char *page2A;
-+	int len, hlen;
-+	unsigned char *p;
-+
-+	g_return_val_if_fail (cdrom != NULL, -1);
-+
-+	*read_speed = 0;
-+	*write_speed = 0;
-+	*write_speeds = NULL;
-+
-+	page2A = pull_page2a_from_cdrom (cdrom);
-+	if (page2A == NULL) {
-+		printf ("Failed to get Page 2A\n");
-+		/* Failed to get Page 2A */
-+		return -1;
-+	}
-+
-+	len = (page2A[0] << 8 | page2A[1]) + 2;
-+	hlen = 8 + (page2A[6] << 8 | page2A[7]);
-+	p = page2A + hlen;
-+
-+	/* Values guessed from the cd_mode_page_2A struct
-+	 * in cdrecord's libscg/scg/scsireg.h */
-+	if (len < (hlen + 30) || p[1] < (30 - 2)) {
-+		/* no MMC-3 "Current Write Speed" present,
-+		 * try to use the MMC-2 one */
-+		if (len < (hlen + 20) || p[1] < (20 - 2))
-+			*write_speed = 0;
-+		else
-+			*write_speed = p[18] << 8 | p[19];
-+	} else {
-+		*write_speed = p[28] << 8 | p[29];
-+	}
-+
-+	if (len >= hlen+9)
-+	    *read_speed = p[8] << 8 | p[9];
-+	else
-+	    *read_speed = 0;
-+
-+	*write_speeds = get_write_speeds (p, len, *write_speed);
-+
-+	free (page2A);
-+
-+	return 0;
-+}
-+
-+
-+static int
-+get_disc_capacity_cd (BRASEROCDROM *cdrom, guint64 *size)
-+{
-+	ScsiCommand *cmd;
-+	int retval;
-+	guint64 block_size;
-+	guint64 num_blocks;
-+	unsigned char header [8];
-+
-+	g_return_val_if_fail (cdrom != NULL, -1);
-+
-+	retval = -1;
-+
-+	cmd = scsi_command_new_from_cdrom (cdrom);
-+	scsi_command_init (cmd, 0, 0x25);
-+	scsi_command_init (cmd, 9, 0);
-+	if (scsi_command_transport (cmd, READ, header, 8)) {
-+		/* READ CDROM CAPACITY failed */
-+		goto done;
-+	}
-+
-+	num_blocks = (header [0] << 24) | (header [1] << 16) | (header [2] << 8) | header [3];
-+	num_blocks++;
-+	block_size = header [4] << 24 | header [5] << 16 | header [6] << 8 | header [7];
-+
-+	if (size) {
-+		*size = num_blocks * block_size;
-+	}
-+	retval = 0;
-+
-+ done:
-+	scsi_command_free (cmd);
-+
-+	return retval;
-+}
-+
-+static int
-+get_disc_capacity_cdr (BRASEROCDROM *cdrom, guint64 *size)
-+{
-+	ScsiCommand *cmd;
-+	int retval;
-+	guint64 secs;
-+	unsigned char toc [8];
-+	unsigned char *atip;
-+	int len;
-+
-+	g_return_val_if_fail (cdrom != NULL, -1);
-+
-+	retval = -1;
-+
-+	cmd = scsi_command_new_from_cdrom (cdrom);
-+	/* READ_TOC */
-+	scsi_command_init (cmd, 0, 0x43);
-+	/* FMT_ATIP */
-+	scsi_command_init (cmd, 2, 4 & 0x0F);
-+	scsi_command_init (cmd, 6, 0);
-+	scsi_command_init (cmd, 8, 4);
-+	scsi_command_init (cmd, 9, 0);
-+
-+	if (scsi_command_transport (cmd, READ, toc, 4)) {
-+		/* READ TOC failed */
-+		goto done;
-+	}
-+
-+	len = 2 + (toc [0] << 8 | toc [1]);
-+
-+	atip = g_new (unsigned char, len);
-+
-+	scsi_command_init (cmd, 0, 0x43);
-+	scsi_command_init (cmd, 2, 4 & 0x0F);
-+	scsi_command_init (cmd, 6, 0);
-+	scsi_command_init (cmd, 7, len >> 8);
-+	scsi_command_init (cmd, 8, len);
-+	scsi_command_init (cmd, 9, 0);
-+
-+	if (scsi_command_transport (cmd, READ, atip, len)) {
-+		/* READ TOC failed */
-+		free (atip);
-+		goto done;
-+	}
-+
-+	secs = atip [12] * 60 + atip [13] + (atip [14] / 75 + 1);
-+
-+	if (size) {
-+		*size = (1 + secs * 7 / 48) * 1024 * 1024;
-+	}
-+	retval = 0;
-+
-+	free (atip);
-+ done:
-+	scsi_command_free (cmd);
-+
-+	return retval;
-+}
-+
-+static int
-+get_disc_capacity_dvdr_from_type (BRASEROCDROM *cdrom, int type, guint64 *size)
-+{
-+	ScsiCommand *cmd;
-+	unsigned char formats [260];
-+	unsigned char buf [32];
-+	guint64 blocks;
-+	guint64 nwa;
-+	int i;
-+	int len;
-+	int obligatory;
-+	int retval;
-+	int next_track;
-+
-+	g_return_val_if_fail (cdrom != NULL, -1);
-+
-+	retval = -1;
-+	blocks = 0;
-+	next_track = 1;
-+
-+	cmd = scsi_command_new_from_cdrom (cdrom);
-+
-+ retry:
-+	if (type == 0x1A || type == 0x14 || type == 0x13 || type == 0x12) {
-+
-+		/* READ FORMAT CAPACITIES */
-+		scsi_command_init (cmd, 0, 0x23);
-+		scsi_command_init (cmd, 8, 12);
-+		scsi_command_init (cmd, 9, 0);
-+		if (scsi_command_transport (cmd, READ, formats, 12)) {
-+			/* READ FORMAT CAPACITIES failed */
-+			goto done;
-+		}
-+
-+		len = formats [3];
-+		if (len & 7 || len < 16) {
-+			/* Length isn't sane */
-+			goto done;
-+		}
-+
-+		scsi_command_init (cmd, 0, 0x23);
-+		scsi_command_init (cmd, 7, (4 + len) >> 8);
-+		scsi_command_init (cmd, 8, (4 + len) & 0xFF);
-+		scsi_command_init (cmd, 9, 0);
-+		if (scsi_command_transport (cmd, READ, formats, 4 + len)) {
-+			/* READ FORMAT CAPACITIES failed */
-+			goto done;
-+		}
-+
-+		if (len != formats [3]) {
-+			/* Parameter length inconsistency */
-+			goto done;
-+		}
-+	}
-+
-+	obligatory = 0x00;
-+
-+	switch (type) {
-+    	case 0x1A:		/* DVD+RW */
-+		obligatory = 0x26;
-+	case 0x13:		/* DVD-RW Restricted Overwrite */
-+	case 0x14:		/* DVD-RW Sequential */
-+		for (i = 8, len = formats [3]; i < len; i += 8) {
-+			if ((formats [4 + i + 4] >> 2) == obligatory) {
-+				break;
-+			}
-+		}
-+
-+		if (i == len) {
-+			/* Can't find obligatory format descriptor */
-+			goto done;
-+		}
-+
-+		blocks  = formats [4 + i + 0] << 24;
-+		blocks |= formats [4 + i + 1] << 16;
-+		blocks |= formats [4 + i + 2] << 8;
-+		blocks |= formats [4 + i + 3];
-+		nwa = formats [4 + 5] << 16 | formats [4 + 6] << 8 | formats [4 + 7];
-+		if (nwa > 2048) {
-+			blocks *= nwa / 2048;
-+		} else if (nwa < 2048) {
-+			blocks /= 2048 / nwa;
-+		}
-+
-+		retval = 0;
-+		break;
-+
-+	case 0x12:		/* DVD-RAM */
-+
-+		blocks  = formats [4 + 0] << 24;
-+		blocks |= formats [4 + 1] << 16;
-+		blocks |= formats [4 + 2] << 8;
-+		blocks |= formats [4 + 3];
-+		nwa = formats [4 + 5] << 16 | formats [4 + 6] << 8 | formats [4 + 7];
-+		if (nwa > 2048) {
-+			blocks *= nwa / 2048;
-+		} else if (nwa < 2048) {
-+			blocks /= 2048 / nwa;
-+		}
-+
-+		retval = 0;
-+		break;
-+
-+	case 0x11:		/* DVD-R */
-+	case 0x1B:		/* DVD+R */
-+	case 0x2B:		/* DVD+R Double Layer */
-+	case 0x41:		/* BD-R SRM */
-+
-+		/* READ TRACK INFORMATION */
-+		scsi_command_init (cmd, 0, 0x52);
-+		scsi_command_init (cmd, 1, 1);
-+		scsi_command_init (cmd, 4, next_track >> 8);
-+		scsi_command_init (cmd, 5, next_track & 0xFF);
-+		scsi_command_init (cmd, 8, sizeof (buf));
-+		scsi_command_init (cmd, 9, 0);
-+		if (scsi_command_transport (cmd, READ, buf, sizeof (buf))) {
-+			/* READ TRACK INFORMATION failed */
-+			if (next_track > 0) {
-+				goto done;
-+			} else {
-+				next_track = 1;
-+				goto retry;
-+			}
-+		}
-+
-+		blocks = buf [24] << 24;
-+		blocks |= buf [25] << 16;
-+		blocks |= buf [26] << 8;
-+		blocks |= buf [27];
-+
-+		retval = 0;
-+		break;
-+	case 0x43:	/* DB-RE */
-+		/* Pull the formatted capacity */
-+		blocks  = formats [4 + 0] << 24;
-+		blocks |= formats [4 + 1] << 16;
-+		blocks |= formats [4 + 2] << 8;
-+		blocks |= formats [4 + 3];
-+		break;
-+	default:
-+		blocks = 0;
-+		break;
-+	}
-+
-+ done:
-+	scsi_command_free (cmd);
-+
-+	if (size) {
-+		*size = blocks * 2048;
-+	}
-+
-+	return retval;
-+}
-+
-+int
-+brasero_cdrom_get_disc_capacity_for_type (BRASEROCDROM *cdrom, int type, guint64 *size)
-+{
-+	int retval;
-+
-+	g_return_val_if_fail (cdrom != NULL, -1);
-+
-+	retval = -1;
-+
-+	switch (type) {
-+	case 0x8:
-+		retval = get_disc_capacity_cd (cdrom, size);
-+		break;
-+	case 0x9:
-+	case 0xa:
-+		retval = get_disc_capacity_cdr (cdrom, size);
-+		break;
-+	case 0x10:
-+		retval = get_disc_capacity_cd (cdrom, size);
-+		break;
-+	case 0x11:
-+	case 0x13:
-+	case 0x14:
-+	case 0x1B:
-+	case 0x2B:
-+	case 0x1A:
-+	case 0x12:
-+	case 0x41:
-+	case 0x43:
-+		retval = get_disc_capacity_dvdr_from_type (cdrom, type, size);
-+		break;
-+	default:
-+		retval = -1;
-+	}
-+
-+	return retval;
-+}
-+
-+int
-+brasero_cdrom_get_disc_type (BRASEROCDROM *cdrom)
-+{
-+	ScsiCommand *cmd;
-+	int retval = -1;
-+	unsigned char header[8];
-+
-+	g_return_val_if_fail (cdrom != NULL, -1);
-+
-+	cmd = scsi_command_new_from_cdrom (cdrom);
-+
-+	scsi_command_init (cmd, 0, 0x46);
-+	scsi_command_init (cmd, 1, 1);
-+	scsi_command_init (cmd, 8, 8);
-+	scsi_command_init (cmd, 9, 0);
-+	if (scsi_command_transport (cmd, READ, header, 8)) {
-+		/* GET CONFIGURATION failed */
-+		scsi_command_free (cmd);
-+		return -1;
-+	}
-+
-+	retval = (header[6]<<8)|(header[7]);
-+
-+
-+	scsi_command_free (cmd);
-+	return retval;
-+}
-+
-+int
-+brasero_cdrom_get_configuration_feature (BRASEROCDROM *cdrom,
-+				  	 int feature,
-+				  	 unsigned char **buf)
-+{
-+	ScsiCommand *cmd;
-+	int retval = 0;
-+	int len;
-+	unsigned char header[8];
-+
-+	g_return_val_if_fail (cdrom != NULL, -1);
-+	g_return_val_if_fail (buf != NULL, -1);
-+
-+	cmd = scsi_command_new_from_cdrom (cdrom);
-+
-+	scsi_command_init (cmd, 0, 0x46);
-+	scsi_command_init (cmd, 1, 2);
-+	scsi_command_init (cmd, 2, feature >> 8);
-+	scsi_command_init (cmd, 3, feature);
-+	scsi_command_init (cmd, 8, 8);
-+	scsi_command_init (cmd, 9, 0);
-+	if (scsi_command_transport (cmd, READ, header, 8)) {
-+		scsi_command_free (cmd);
-+		return -1;
-+	}
-+
-+	len = 4 + (header[0] << 24 | header[1] << 16 | header[2] << 8 | header[3]);
-+	if (len > 264) {
-+		scsi_command_free (cmd);
-+		return -1;
-+	}
-+
-+	*buf = g_new (unsigned char, len);
-+
-+	scsi_command_init (cmd, 0, 0x46);
-+	scsi_command_init (cmd, 1, 2);
-+	scsi_command_init (cmd, 2, feature >> 8);
-+	scsi_command_init (cmd, 3, feature);
-+	scsi_command_init (cmd, 7, len >> 8);
-+	scsi_command_init (cmd, 8, len);
-+	scsi_command_init (cmd, 9, 0);
-+	if (scsi_command_transport (cmd, READ, *buf, len)) {
-+		g_free (*buf);
-+		*buf = NULL;
-+		retval = -1;
-+	}
-+
-+	scsi_command_free (cmd);
-+
-+	return retval;
-+}
-+
-+int
-+brasero_cdrom_read_disc_information_std (BRASEROCDROM *cdrom,
-+				         unsigned char *buf)
-+{
-+	ScsiCommand *cmd;
-+	int retval = 0;
-+
-+	g_return_val_if_fail (cdrom != NULL, -1);
-+	g_return_val_if_fail (buf != NULL, -1);
-+
-+	cmd = scsi_command_new_from_cdrom (cdrom);
-+
-+	/* see section 5.19 of MMC-3 from http://www.t10.org/drafts.htm#mmc3 */
-+	scsi_command_init (cmd, 0, 0x51); /* READ_DISC_INFORMATION */
-+	scsi_command_init (cmd, 8, 32);
-+	scsi_command_init (cmd, 9, 0);
-+	if (scsi_command_transport (cmd, READ, buf, 32)) {
-+		retval = -1;
-+	}
-+
-+	scsi_command_free (cmd);
-+	return retval;
-+}
-+
-+int
-+brasero_cdrom_read_track_info (BRASEROCDROM *cdrom,
-+			       int track_num,
-+			       unsigned char *buf,
-+			       int size)
-+{
-+	ScsiCommand *cmd;
-+	int retval = 0;
-+
-+	g_return_val_if_fail (cdrom != NULL, -1);
-+	g_return_val_if_fail (buf != NULL, -1);
-+
-+	cmd = scsi_command_new_from_cdrom (cdrom);
-+
-+	scsi_command_init (cmd, 0, 0x52);
-+	scsi_command_init (cmd, 1, 1);
-+	scsi_command_init (cmd, 4, track_num >> 8);
-+	scsi_command_init (cmd, 5, track_num & 0xFF);
-+	scsi_command_init (cmd, 8, size);
-+	scsi_command_init (cmd, 9, 0);
-+	if (scsi_command_transport (cmd, READ, buf, size)) {
-+		retval = -1;
-+	}
-+
-+	scsi_command_free (cmd);
-+	return retval;
-+}
-+
-+int
-+brasero_cdrom_read_toc_formatted (BRASEROCDROM *cdrom,
-+				  int track_num,
-+				  unsigned char **buf)
-+{
-+	ScsiCommand *cmd;
-+	int retval = 0;
-+	int len;
-+	unsigned char header[4];
-+
-+	g_return_val_if_fail (cdrom != NULL, -1);
-+	g_return_val_if_fail (buf != NULL, -1);
-+
-+	cmd = scsi_command_new_from_cdrom (cdrom);
-+
-+	scsi_command_init (cmd, 0, 0x43);
-+	scsi_command_init (cmd, 2, 0);
-+	scsi_command_init (cmd, 6, track_num);
-+	scsi_command_init (cmd, 8, 4);
-+	scsi_command_init (cmd, 9, 0);
-+	if (scsi_command_transport (cmd, READ, header, 4)) {
-+		scsi_command_free (cmd);
-+		*buf = NULL;
-+		return -1;
-+	}
-+
-+	len = (header[0] << 8 | header[1]) + 2;
-+
-+	*buf = g_malloc0 (len);
-+
-+	scsi_command_init (cmd, 8, len);
-+	scsi_command_init (cmd, 9, 0);
-+	if (scsi_command_transport (cmd, READ, *buf, len)) {
-+		g_free (*buf);
-+		*buf = NULL;
-+		retval = -1;
-+	}
-+
-+	scsi_command_free (cmd);
-+	return retval;
-+}
-+
-+int
-+brasero_cdrom_read_toc_raw (BRASEROCDROM *cdrom,
-+			    int track_num,
-+			    unsigned char **buf)
-+{
-+	ScsiCommand *cmd;
-+	int retval = 0;
-+	int len;
-+	unsigned char header[4];
-+
-+	g_return_val_if_fail (cdrom != NULL, -1);
-+	g_return_val_if_fail (buf != NULL, -1);
-+
-+	cmd = scsi_command_new_from_cdrom (cdrom);
-+
-+	scsi_command_init (cmd, 0, 0x43);
-+	scsi_command_init (cmd, 2, 2);
-+	scsi_command_init (cmd, 6, track_num);
-+	scsi_command_init (cmd, 8, 4);
-+	scsi_command_init (cmd, 9, 0);
-+	if (scsi_command_transport (cmd, READ, header, 4)) {
-+		scsi_command_free (cmd);
-+		*buf = NULL;
-+		return -1;
-+	}
-+
-+	len = (header[0] << 8 | header[1]) + 2;
-+
-+	*buf = g_malloc0 (len);
-+
-+	scsi_command_init (cmd, 8, len);
-+	scsi_command_init (cmd, 9, 0);
-+	if (scsi_command_transport (cmd, READ, *buf, len)) {
-+		g_free (*buf);
-+		*buf = NULL;
-+		retval = -1;
-+	}
-+
-+	scsi_command_free (cmd);
-+	return retval;
-+}
-+
-+int
-+brasero_cdrom_read_atip (BRASEROCDROM *cdrom,
-+			 unsigned char **buf)
-+{
-+	ScsiCommand *cmd;
-+	int retval = 0;
-+	int len;
-+	unsigned char header[4];
-+
-+	g_return_val_if_fail (cdrom != NULL, -1);
-+	g_return_val_if_fail (buf != NULL, -1);
-+
-+	cmd = scsi_command_new_from_cdrom (cdrom);
-+
-+	scsi_command_init (cmd, 0, 0x43);
-+	scsi_command_init (cmd, 2, 4);
-+	scsi_command_init (cmd, 6, 0);
-+	scsi_command_init (cmd, 8, 4);
-+	scsi_command_init (cmd, 9, 0);
-+	if (scsi_command_transport (cmd, READ, header, 4)) {
-+		scsi_command_free (cmd);
-+		*buf = NULL;
-+		return -1;
-+	}
-+
-+	len = (header[0] << 8 | header[1]) + 2;
-+
-+	*buf = g_malloc0 (len);
-+
-+	scsi_command_init (cmd, 8, len);
-+	scsi_command_init (cmd, 9, 0);
-+	if (scsi_command_transport (cmd, READ, *buf, len)) {
-+		g_free (*buf);
-+		*buf = NULL;
-+		retval = -1;
-+	}
-+
-+	scsi_command_free (cmd);
-+	return retval;
-+}
-+
-+int
-+brasero_cdrom_read_format_capacities (BRASEROCDROM *cdrom,
-+			 	      unsigned char **buf)
-+{
-+	ScsiCommand *cmd;
-+	int retval = 0;
-+	int len;
-+	unsigned char header[12];
-+
-+	g_return_val_if_fail (cdrom != NULL, -1);
-+	g_return_val_if_fail (buf != NULL, -1);
-+
-+	cmd = scsi_command_new_from_cdrom (cdrom);
-+
-+	scsi_command_init (cmd, 0, 0x23);
-+	scsi_command_init (cmd, 8, 12);
-+	scsi_command_init (cmd, 9, 0);
-+	if (scsi_command_transport (cmd, READ, header, 12)) {
-+		/* READ FORMAT CAPACITIES failed */
-+		return -1;
-+	}
-+
-+	len = header [3];
-+	if (len & 7 || len < 16) {
-+		/* Length isn't sane */
-+		return -1;
-+	}
-+
-+	*buf = g_new (unsigned char, len + 4);
-+
-+	scsi_command_init (cmd, 0, 0x23);
-+	scsi_command_init (cmd, 7, (4 + len) >> 8);
-+	scsi_command_init (cmd, 8, (4 + len) & 0xFF);
-+	scsi_command_init (cmd, 9, 0);
-+	if (scsi_command_transport (cmd, READ, *buf, 4 + len)) {
-+		/* READ FORMAT CAPACITIES failed */
-+		g_free (*buf);
-+		*buf = NULL;
-+		retval = -1;
-+	}
-+
-+	return retval;
-+}
-+
-+int
-+brasero_cdrom_get_performance_wrt_spd_desc (BRASEROCDROM *cdrom,
-+			    		    unsigned char **buf)
-+{
-+	ScsiCommand *cmd;
-+	int retval = 0;
-+	int len;
-+	int desc_num;
-+	unsigned char header[8];
-+
-+	g_return_val_if_fail (cdrom != NULL, -1);
-+	g_return_val_if_fail (buf != NULL, -1);
-+
-+	cmd = scsi_command_new_from_cdrom (cdrom);
-+
-+	scsi_command_init (cmd, 0, 0xac);
-+	scsi_command_init (cmd, 8, 0);
-+	scsi_command_init (cmd, 9, 0);
-+	scsi_command_init (cmd, 10, 3);
-+	scsi_command_init (cmd, 11, 0);
-+	if (scsi_command_transport (cmd, READ, header, 8)) {
-+		scsi_command_free (cmd);
-+		*buf = NULL;
-+		return -1;
-+	}
-+
-+	len = (header[0] << 24 | header[1] << 16 | header[2] << 8 | header[3]) + 4;
-+	if (len > 2048) {
-+		len = 2048;
-+	}
-+
-+	desc_num = (len - 8) / 12;
-+
-+	*buf = g_malloc0 (len);
-+
-+	scsi_command_init (cmd, 8, desc_num >> 8);
-+	scsi_command_init (cmd, 9, desc_num);
-+	scsi_command_init (cmd, 11, 0);
-+	if (scsi_command_transport (cmd, READ, *buf, len)) {
-+		g_free (*buf);
-+		*buf = NULL;
-+		retval = -1;
-+	}
-+
-+	scsi_command_free (cmd);
-+	return retval;
-+}
-+
-+int
-+brasero_cdrom_disc_is_appendable (BRASEROCDROM *cdrom)
-+{
-+	ScsiCommand *cmd;
-+	int retval = -1;
-+	unsigned char header[32];
-+
-+	g_return_val_if_fail (cdrom != NULL, -1);
-+
-+	cmd = scsi_command_new_from_cdrom (cdrom);
-+
-+	/* see section 5.19 of MMC-3 from http://www.t10.org/drafts.htm#mmc3 */
-+	scsi_command_init (cmd, 0, 0x51); /* READ_DISC_INFORMATION */
-+	scsi_command_init (cmd, 8, 32);
-+	scsi_command_init (cmd, 9, 0);
-+	if (scsi_command_transport (cmd, READ, header, 32)) {
-+		/* READ_DISC_INFORMATION failed */
-+		scsi_command_free (cmd);
-+		return 0;
-+	}
-+
-+	retval = ((header[2]&0x03) == 0x01);
-+
-+	scsi_command_free (cmd);
-+	return retval;
-+}
-+
-+int
-+brasero_cdrom_disc_is_rewritable (BRASEROCDROM *cdrom)
-+{
-+	ScsiCommand *cmd;
-+	int retval = -1;
-+	unsigned char header[32];
-+
-+	g_return_val_if_fail (cdrom != NULL, -1);
-+
-+	cmd = scsi_command_new_from_cdrom (cdrom);
-+
-+	/* see section 5.19 of MMC-3 from http://www.t10.org/drafts.htm#mmc3 */
-+	scsi_command_init (cmd, 0, 0x51); /* READ_DISC_INFORMATION */
-+	scsi_command_init (cmd, 8, 32);
-+	scsi_command_init (cmd, 9, 0);
-+	if (scsi_command_transport (cmd, READ, header, 32)) {
-+		/* READ_DISC_INFORMATION failed */
-+		scsi_command_free (cmd);
-+		return 0;
-+	}
-+
-+	retval = ((header[2]&0x10) != 0);
-+
-+	scsi_command_free (cmd);
-+	return retval;
-+}
diff --git a/sysutils/brasero/files/patch-src_plugins_cdrtools_burn-cdrecord.c b/sysutils/brasero/files/patch-src_plugins_cdrtools_burn-cdrecord.c
deleted file mode 100644
index 583807240..000000000
--- a/sysutils/brasero/files/patch-src_plugins_cdrtools_burn-cdrecord.c
+++ /dev/null
@@ -1,11 +0,0 @@
---- src/plugins/cdrtools/burn-cdrecord.c.orig	2008-01-02 14:59:18.000000000 -0500
-+++ src/plugins/cdrtools/burn-cdrecord.c	2008-01-02 14:59:27.000000000 -0500
-@@ -899,7 +899,7 @@ brasero_cdrecord_set_argv (BraseroProces
- 	g_ptr_array_add (argv, g_strdup ("cdrecord"));
- 	g_ptr_array_add (argv, g_strdup ("-v"));
- 
--	brasero_job_get_device (BRASERO_JOB (cdrecord), &device);
-+	brasero_job_get_cdrecord_device (BRASERO_JOB (cdrecord), &device);
- 	dev_str = g_strdup_printf ("dev=%s", device);
- 	g_ptr_array_add (argv, dev_str);
- 	g_free (device);
diff --git a/sysutils/brasero/pkg-descr b/sysutils/brasero/pkg-descr
deleted file mode 100644
index 2e6f14b59..000000000
--- a/sysutils/brasero/pkg-descr
+++ /dev/null
@@ -1,23 +0,0 @@
-CD/DVD mastering tool for the gnome desktop. It has been designed to be
-simple and easy to use.
- 
-Features:
-Data CD/DVD:
-- supports edition of discs contents
-- can burn data CD/DVD on the fly
-- supports multisession
-- supports joliet extension
-- can write the image to the hard drive
-Audio CD:
-- write CD-TEXT information (automatically found thanks to gstreamer)
-- supports the edition of CD-TEXT information
-- can burn audio CD on the fly
-- can use all audio files handled by Gstreamer local installation
-- can search for audio files inside dropped folders
-CD/DVD copy:
-- can copy a CD/DVD to the hard drive
-- can copy DVD and CD on the fly
-- supports single-session data DVD
-- supports any kind of CD
-
-WWW: http://perso.wanadoo.fr/bonfire/
diff --git a/sysutils/brasero/pkg-plist b/sysutils/brasero/pkg-plist
deleted file mode 100644
index acbe2314b..000000000
--- a/sysutils/brasero/pkg-plist
+++ /dev/null
@@ -1,245 +0,0 @@
-bin/brasero
-lib/brasero/plugins/libbrasero-cdrdao.la
-lib/brasero/plugins/libbrasero-cdrdao.so
-lib/brasero/plugins/libbrasero-cdrecord.la
-lib/brasero/plugins/libbrasero-cdrecord.so
-lib/brasero/plugins/libbrasero-dvdcss.la
-lib/brasero/plugins/libbrasero-dvdcss.so
-lib/brasero/plugins/libbrasero-dvdrwformat.la
-lib/brasero/plugins/libbrasero-dvdrwformat.so
-lib/brasero/plugins/libbrasero-genisoimage.la
-lib/brasero/plugins/libbrasero-genisoimage.so
-lib/brasero/plugins/libbrasero-growisofs.la
-lib/brasero/plugins/libbrasero-growisofs.so
-lib/brasero/plugins/libbrasero-local-track.la
-lib/brasero/plugins/libbrasero-local-track.so
-lib/brasero/plugins/libbrasero-md5sum-file.la
-lib/brasero/plugins/libbrasero-md5sum-file.so
-lib/brasero/plugins/libbrasero-md5sum.la
-lib/brasero/plugins/libbrasero-md5sum.so
-lib/brasero/plugins/libbrasero-mkisofs.la
-lib/brasero/plugins/libbrasero-mkisofs.so
-lib/brasero/plugins/libbrasero-readcd.la
-lib/brasero/plugins/libbrasero-readcd.so
-lib/brasero/plugins/libbrasero-readom.la
-lib/brasero/plugins/libbrasero-readom.so
-lib/brasero/plugins/libbrasero-toc2cue.la
-lib/brasero/plugins/libbrasero-toc2cue.so
-lib/brasero/plugins/libbrasero-transcode.la
-lib/brasero/plugins/libbrasero-transcode.so
-lib/brasero/plugins/libbrasero-wodim.la
-lib/brasero/plugins/libbrasero-wodim.so
-share/applications/brasero.desktop
-%%DATADIR%%/icons/hicolor/16x16/actions/insert-pause.png
-%%DATADIR%%/icons/hicolor/16x16/actions/iso-image-burn.png
-%%DATADIR%%/icons/hicolor/16x16/actions/iso-image-new.png
-%%DATADIR%%/icons/hicolor/16x16/actions/media-optical-audio-new.png
-%%DATADIR%%/icons/hicolor/16x16/actions/media-optical-blank.png
-%%DATADIR%%/icons/hicolor/16x16/actions/media-optical-burn.png
-%%DATADIR%%/icons/hicolor/16x16/actions/media-optical-copy.png
-%%DATADIR%%/icons/hicolor/16x16/actions/media-optical-data-new.png
-%%DATADIR%%/icons/hicolor/16x16/actions/transform-crop-and-resize.png
-%%DATADIR%%/icons/hicolor/16x16/status/brasero-disc-00.png
-%%DATADIR%%/icons/hicolor/16x16/status/brasero-disc-05.png
-%%DATADIR%%/icons/hicolor/16x16/status/brasero-disc-10.png
-%%DATADIR%%/icons/hicolor/16x16/status/brasero-disc-100.png
-%%DATADIR%%/icons/hicolor/16x16/status/brasero-disc-15.png
-%%DATADIR%%/icons/hicolor/16x16/status/brasero-disc-20.png
-%%DATADIR%%/icons/hicolor/16x16/status/brasero-disc-25.png
-%%DATADIR%%/icons/hicolor/16x16/status/brasero-disc-30.png
-%%DATADIR%%/icons/hicolor/16x16/status/brasero-disc-35.png
-%%DATADIR%%/icons/hicolor/16x16/status/brasero-disc-40.png
-%%DATADIR%%/icons/hicolor/16x16/status/brasero-disc-45.png
-%%DATADIR%%/icons/hicolor/16x16/status/brasero-disc-50.png
-%%DATADIR%%/icons/hicolor/16x16/status/brasero-disc-55.png
-%%DATADIR%%/icons/hicolor/16x16/status/brasero-disc-60.png
-%%DATADIR%%/icons/hicolor/16x16/status/brasero-disc-65.png
-%%DATADIR%%/icons/hicolor/16x16/status/brasero-disc-70.png
-%%DATADIR%%/icons/hicolor/16x16/status/brasero-disc-75.png
-%%DATADIR%%/icons/hicolor/16x16/status/brasero-disc-80.png
-%%DATADIR%%/icons/hicolor/16x16/status/brasero-disc-85.png
-%%DATADIR%%/icons/hicolor/16x16/status/brasero-disc-90.png
-%%DATADIR%%/icons/hicolor/16x16/status/brasero-disc-95.png
-%%DATADIR%%/icons/hicolor/22x22/actions/insert-pause.png
-%%DATADIR%%/icons/hicolor/22x22/actions/iso-image-burn.png
-%%DATADIR%%/icons/hicolor/22x22/actions/iso-image-new.png
-%%DATADIR%%/icons/hicolor/22x22/actions/media-optical-audio-new.png
-%%DATADIR%%/icons/hicolor/22x22/actions/media-optical-blank.png
-%%DATADIR%%/icons/hicolor/22x22/actions/media-optical-burn.png
-%%DATADIR%%/icons/hicolor/22x22/actions/media-optical-copy.png
-%%DATADIR%%/icons/hicolor/22x22/actions/media-optical-data-new.png
-%%DATADIR%%/icons/hicolor/22x22/actions/transform-crop-and-resize.png
-%%DATADIR%%/icons/hicolor/22x22/status/brasero-disc-00.png
-%%DATADIR%%/icons/hicolor/22x22/status/brasero-disc-05.png
-%%DATADIR%%/icons/hicolor/22x22/status/brasero-disc-10.png
-%%DATADIR%%/icons/hicolor/22x22/status/brasero-disc-100.png
-%%DATADIR%%/icons/hicolor/22x22/status/brasero-disc-15.png
-%%DATADIR%%/icons/hicolor/22x22/status/brasero-disc-20.png
-%%DATADIR%%/icons/hicolor/22x22/status/brasero-disc-25.png
-%%DATADIR%%/icons/hicolor/22x22/status/brasero-disc-30.png
-%%DATADIR%%/icons/hicolor/22x22/status/brasero-disc-35.png
-%%DATADIR%%/icons/hicolor/22x22/status/brasero-disc-40.png
-%%DATADIR%%/icons/hicolor/22x22/status/brasero-disc-45.png
-%%DATADIR%%/icons/hicolor/22x22/status/brasero-disc-50.png
-%%DATADIR%%/icons/hicolor/22x22/status/brasero-disc-55.png
-%%DATADIR%%/icons/hicolor/22x22/status/brasero-disc-60.png
-%%DATADIR%%/icons/hicolor/22x22/status/brasero-disc-65.png
-%%DATADIR%%/icons/hicolor/22x22/status/brasero-disc-70.png
-%%DATADIR%%/icons/hicolor/22x22/status/brasero-disc-75.png
-%%DATADIR%%/icons/hicolor/22x22/status/brasero-disc-80.png
-%%DATADIR%%/icons/hicolor/22x22/status/brasero-disc-85.png
-%%DATADIR%%/icons/hicolor/22x22/status/brasero-disc-90.png
-%%DATADIR%%/icons/hicolor/22x22/status/brasero-disc-95.png
-%%DATADIR%%/icons/hicolor/24x24/actions/insert-pause.png
-%%DATADIR%%/icons/hicolor/24x24/actions/iso-image-burn.png
-%%DATADIR%%/icons/hicolor/24x24/actions/iso-image-new.png
-%%DATADIR%%/icons/hicolor/24x24/actions/media-optical-audio-new.png
-%%DATADIR%%/icons/hicolor/24x24/actions/media-optical-blank.png
-%%DATADIR%%/icons/hicolor/24x24/actions/media-optical-burn.png
-%%DATADIR%%/icons/hicolor/24x24/actions/media-optical-copy.png
-%%DATADIR%%/icons/hicolor/24x24/actions/media-optical-data-new.png
-%%DATADIR%%/icons/hicolor/24x24/actions/transform-crop-and-resize.png
-%%DATADIR%%/icons/hicolor/24x24/status/brasero-disc-00.png
-%%DATADIR%%/icons/hicolor/24x24/status/brasero-disc-05.png
-%%DATADIR%%/icons/hicolor/24x24/status/brasero-disc-10.png
-%%DATADIR%%/icons/hicolor/24x24/status/brasero-disc-100.png
-%%DATADIR%%/icons/hicolor/24x24/status/brasero-disc-15.png
-%%DATADIR%%/icons/hicolor/24x24/status/brasero-disc-20.png
-%%DATADIR%%/icons/hicolor/24x24/status/brasero-disc-25.png
-%%DATADIR%%/icons/hicolor/24x24/status/brasero-disc-30.png
-%%DATADIR%%/icons/hicolor/24x24/status/brasero-disc-35.png
-%%DATADIR%%/icons/hicolor/24x24/status/brasero-disc-40.png
-%%DATADIR%%/icons/hicolor/24x24/status/brasero-disc-45.png
-%%DATADIR%%/icons/hicolor/24x24/status/brasero-disc-50.png
-%%DATADIR%%/icons/hicolor/24x24/status/brasero-disc-55.png
-%%DATADIR%%/icons/hicolor/24x24/status/brasero-disc-60.png
-%%DATADIR%%/icons/hicolor/24x24/status/brasero-disc-65.png
-%%DATADIR%%/icons/hicolor/24x24/status/brasero-disc-70.png
-%%DATADIR%%/icons/hicolor/24x24/status/brasero-disc-75.png
-%%DATADIR%%/icons/hicolor/24x24/status/brasero-disc-80.png
-%%DATADIR%%/icons/hicolor/24x24/status/brasero-disc-85.png
-%%DATADIR%%/icons/hicolor/24x24/status/brasero-disc-90.png
-%%DATADIR%%/icons/hicolor/24x24/status/brasero-disc-95.png
-%%DATADIR%%/icons/hicolor/32x32/actions/insert-pause.png
-%%DATADIR%%/icons/hicolor/32x32/actions/iso-image-burn.png
-%%DATADIR%%/icons/hicolor/32x32/actions/iso-image-new.png
-%%DATADIR%%/icons/hicolor/32x32/actions/media-optical-audio-new.png
-%%DATADIR%%/icons/hicolor/32x32/actions/media-optical-blank.png
-%%DATADIR%%/icons/hicolor/32x32/actions/media-optical-burn.png
-%%DATADIR%%/icons/hicolor/32x32/actions/media-optical-copy.png
-%%DATADIR%%/icons/hicolor/32x32/actions/media-optical-data-new.png
-%%DATADIR%%/icons/hicolor/32x32/status/brasero-disc-00.png
-%%DATADIR%%/icons/hicolor/32x32/status/brasero-disc-05.png
-%%DATADIR%%/icons/hicolor/32x32/status/brasero-disc-10.png
-%%DATADIR%%/icons/hicolor/32x32/status/brasero-disc-100.png
-%%DATADIR%%/icons/hicolor/32x32/status/brasero-disc-15.png
-%%DATADIR%%/icons/hicolor/32x32/status/brasero-disc-20.png
-%%DATADIR%%/icons/hicolor/32x32/status/brasero-disc-25.png
-%%DATADIR%%/icons/hicolor/32x32/status/brasero-disc-30.png
-%%DATADIR%%/icons/hicolor/32x32/status/brasero-disc-35.png
-%%DATADIR%%/icons/hicolor/32x32/status/brasero-disc-40.png
-%%DATADIR%%/icons/hicolor/32x32/status/brasero-disc-45.png
-%%DATADIR%%/icons/hicolor/32x32/status/brasero-disc-50.png
-%%DATADIR%%/icons/hicolor/32x32/status/brasero-disc-55.png
-%%DATADIR%%/icons/hicolor/32x32/status/brasero-disc-60.png
-%%DATADIR%%/icons/hicolor/32x32/status/brasero-disc-65.png
-%%DATADIR%%/icons/hicolor/32x32/status/brasero-disc-70.png
-%%DATADIR%%/icons/hicolor/32x32/status/brasero-disc-75.png
-%%DATADIR%%/icons/hicolor/32x32/status/brasero-disc-80.png
-%%DATADIR%%/icons/hicolor/32x32/status/brasero-disc-85.png
-%%DATADIR%%/icons/hicolor/32x32/status/brasero-disc-90.png
-%%DATADIR%%/icons/hicolor/32x32/status/brasero-disc-95.png
-%%DATADIR%%/icons/hicolor/scalable/actions/insert-pause.svg
-%%DATADIR%%/icons/hicolor/scalable/actions/iso-image-burn.svg
-%%DATADIR%%/icons/hicolor/scalable/actions/iso-image-new.svg
-%%DATADIR%%/icons/hicolor/scalable/actions/media-optical-audio-new.svg
-%%DATADIR%%/icons/hicolor/scalable/actions/media-optical-blank.svg
-%%DATADIR%%/icons/hicolor/scalable/actions/media-optical-burn.svg
-%%DATADIR%%/icons/hicolor/scalable/actions/media-optical-copy.svg
-%%DATADIR%%/icons/hicolor/scalable/actions/media-optical-data-new.svg
-%%DATADIR%%/icons/hicolor/scalable/actions/transform-crop-and-resize.svg
-%%DATADIR%%/icons/hicolor/scalable/status/brasero-disc-00.svg
-%%DATADIR%%/icons/hicolor/scalable/status/brasero-disc-05.svg
-%%DATADIR%%/icons/hicolor/scalable/status/brasero-disc-10.svg
-%%DATADIR%%/icons/hicolor/scalable/status/brasero-disc-100.svg
-%%DATADIR%%/icons/hicolor/scalable/status/brasero-disc-15.svg
-%%DATADIR%%/icons/hicolor/scalable/status/brasero-disc-20.svg
-%%DATADIR%%/icons/hicolor/scalable/status/brasero-disc-25.svg
-%%DATADIR%%/icons/hicolor/scalable/status/brasero-disc-30.svg
-%%DATADIR%%/icons/hicolor/scalable/status/brasero-disc-35.svg
-%%DATADIR%%/icons/hicolor/scalable/status/brasero-disc-40.svg
-%%DATADIR%%/icons/hicolor/scalable/status/brasero-disc-45.svg
-%%DATADIR%%/icons/hicolor/scalable/status/brasero-disc-50.svg
-%%DATADIR%%/icons/hicolor/scalable/status/brasero-disc-55.svg
-%%DATADIR%%/icons/hicolor/scalable/status/brasero-disc-60.svg
-%%DATADIR%%/icons/hicolor/scalable/status/brasero-disc-65.svg
-%%DATADIR%%/icons/hicolor/scalable/status/brasero-disc-70.svg
-%%DATADIR%%/icons/hicolor/scalable/status/brasero-disc-75.svg
-%%DATADIR%%/icons/hicolor/scalable/status/brasero-disc-80.svg
-%%DATADIR%%/icons/hicolor/scalable/status/brasero-disc-85.svg
-%%DATADIR%%/icons/hicolor/scalable/status/brasero-disc-90.svg
-%%DATADIR%%/icons/hicolor/scalable/status/brasero-disc-95.svg
-%%DATADIR%%/logo.png
-share/icons/hicolor/16x16/apps/brasero.png
-share/icons/hicolor/22x22/apps/brasero.png
-share/icons/hicolor/24x24/apps/brasero.png
-share/icons/hicolor/32x32/apps/brasero.png
-share/icons/hicolor/48x48/apps/brasero.png
-share/icons/hicolor/scalable/apps/brasero.svg
-share/locale/ar/LC_MESSAGES/brasero.mo
-share/locale/ca/LC_MESSAGES/brasero.mo
-share/locale/cs/LC_MESSAGES/brasero.mo
-share/locale/de/LC_MESSAGES/brasero.mo
-share/locale/dz/LC_MESSAGES/brasero.mo
-share/locale/en_GB/LC_MESSAGES/brasero.mo
-share/locale/es/LC_MESSAGES/brasero.mo
-share/locale/fi/LC_MESSAGES/brasero.mo
-share/locale/fr/LC_MESSAGES/brasero.mo
-share/locale/gl/LC_MESSAGES/brasero.mo
-share/locale/he/LC_MESSAGES/brasero.mo
-share/locale/hu/LC_MESSAGES/brasero.mo
-share/locale/it/LC_MESSAGES/brasero.mo
-share/locale/ja/LC_MESSAGES/brasero.mo
-share/locale/lt/LC_MESSAGES/brasero.mo
-share/locale/mk/LC_MESSAGES/brasero.mo
-share/locale/nb/LC_MESSAGES/brasero.mo
-share/locale/oc/LC_MESSAGES/brasero.mo
-share/locale/pa/LC_MESSAGES/brasero.mo
-share/locale/pl/LC_MESSAGES/brasero.mo
-share/locale/pt/LC_MESSAGES/brasero.mo
-share/locale/pt_BR/LC_MESSAGES/brasero.mo
-share/locale/ru/LC_MESSAGES/brasero.mo
-share/locale/sl/LC_MESSAGES/brasero.mo
-share/locale/sr/LC_MESSAGES/brasero.mo
-share/locale/sr@Latn/LC_MESSAGES/brasero.mo
-share/locale/sv/LC_MESSAGES/brasero.mo
-share/mime/packages/brasero.xml
-@dirrm %%DATADIR%%/icons/hicolor/16x16/status
-@dirrm %%DATADIR%%/icons/hicolor/16x16/actions
-@dirrm %%DATADIR%%/icons/hicolor/16x16
-@dirrm %%DATADIR%%/icons/hicolor/22x22/status
-@dirrm %%DATADIR%%/icons/hicolor/22x22/actions
-@dirrm %%DATADIR%%/icons/hicolor/22x22
-@dirrm %%DATADIR%%/icons/hicolor/24x24/status
-@dirrm %%DATADIR%%/icons/hicolor/24x24/actions
-@dirrm %%DATADIR%%/icons/hicolor/24x24
-@dirrm %%DATADIR%%/icons/hicolor/32x32/status
-@dirrm %%DATADIR%%/icons/hicolor/32x32/actions
-@dirrm %%DATADIR%%/icons/hicolor/32x32
-@dirrm %%DATADIR%%/icons/hicolor/scalable/status
-@dirrm %%DATADIR%%/icons/hicolor/scalable/actions
-@dirrm %%DATADIR%%/icons/hicolor/scalable
-@dirrm %%DATADIR%%/icons/hicolor
-@dirrm %%DATADIR%%/icons
-@dirrm %%DATADIR%%
-@dirrmtry share/applications
-@dirrm lib/brasero/plugins
-@dirrm lib/brasero
-@exec %%LOCALBASE%%/bin/update-mime-database %D/share/mime
-@unexec %%LOCALBASE%%/bin/update-mime-database %D/share/mime
-@exec %%LOCALBASE%%/bin/update-desktop-database > /dev/null || /usr/bin/true
-@unexec %%LOCALBASE%%/bin/update-desktop-database > /dev/null || /usr/bin/true
-@dirrmtry share/locale/oc/LC_MESSAGES
-@dirrmtry share/locale/oc
-@dirrmtry share/locale/dz/LC_MESSAGES
-@dirrmtry share/locale/dz
diff --git a/sysutils/consolekit/Makefile b/sysutils/consolekit/Makefile
deleted file mode 100644
index 9a40dc1bc..000000000
--- a/sysutils/consolekit/Makefile
+++ /dev/null
@@ -1,38 +0,0 @@
-# New ports collection makefile for:	ConsoleKit
-# Date Created:				26 Aug 2006
-# Whom:					Florent Thoumie <flz@FreeBSD.org>
-#
-# $FreeBSD$
-#    $MCom$
-
-PORTNAME=	consolekit
-PORTVERSION=	0.2.10
-CATEGORIES=	sysutils gnome
-MASTER_SITES=	http://people.freedesktop.org/~mccann/dist/
-DISTFILES=	ConsoleKit-${PORTVERSION}${EXTRACT_SUFX}
-
-MAINTAINER=	gnome@FreeBSD.org
-COMMENT=	Framework for defining and tracking users
-
-LIB_DEPENDS=	dbus-glib-1.2:${PORTSDIR}/devel/dbus-glib \
-    		polkit.2:${PORTSDIR}/sysutils/policykit
-
-WRKSRC=		${WRKDIR}/ConsoleKit-${PORTVERSION}
-USE_XORG=	x11
-USE_GNOME=	gnomehack gnometarget
-USE_GMAKE=	yes
-GNU_CONFIGURE=	yes
-USE_LDCONFIG=	yes
-CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" \
-		LDFLAGS="-L${LOCALBASE}/lib"
-CONFIGURE_ARGS=	--with-pid-file=/var/run/${PORTNAME}.pid \
-		--localstatedir=/var
-
-post-install:
-	${INSTALL_SCRIPT} ${FILESDIR}/ck-get-x11-display-device \
-	    	${PREFIX}/libexec/ck-get-x11-display-device
-	${INSTALL_SCRIPT} ${FILESDIR}/ck-get-x11-server-pid \
-	    	${PREFIX}/libexec/ck-get-x11-server-pid
-	${MKDIR} /var/log/ConsoleKit
-
-.include <bsd.port.mk>
diff --git a/sysutils/consolekit/distinfo b/sysutils/consolekit/distinfo
deleted file mode 100644
index be8639003..000000000
--- a/sysutils/consolekit/distinfo
+++ /dev/null
@@ -1,3 +0,0 @@
-MD5 (ConsoleKit-0.2.10.tar.gz) = b85c2333a8fe31c0d3f29caa14716634
-SHA256 (ConsoleKit-0.2.10.tar.gz) = 02b9510f65256db33a5e079736bb7234cd5599bf02dc77399d81d50cf5183bcb
-SIZE (ConsoleKit-0.2.10.tar.gz) = 521473
diff --git a/sysutils/consolekit/files/ck-get-x11-display-device b/sysutils/consolekit/files/ck-get-x11-display-device
deleted file mode 100644
index 6fc508360..000000000
--- a/sysutils/consolekit/files/ck-get-x11-display-device
+++ /dev/null
@@ -1,35 +0,0 @@
-#!/bin/sh
-
-FSTAT="/usr/bin/fstat"
-GREP="/usr/bin/grep"
-AWK="/usr/bin/awk"
-SED="/usr/bin/sed"
-CAT="/bin/cat"
-HEAD="/usr/bin/head"
-
-dispnum=0
-if [ x"$1" = x"--display" ]; then
-    if [ $# != 2 ]; then
-	echo "usage: $0 [--display DISPLAY]"
-	exit 1
-    fi
-    DISPLAY=$2
-fi
-if [ ! -z "${DISPLAY}" ]; then
-    dispnum=$(echo ${DISPLAY} | ${SED} -E -e 's|:([0-9]+).*|\1|')
-fi
-
-if [ ! -f "/tmp/.X${dispnum}-lock" ]; then
-    echo "ERROR: Failed to find X lock file for display ${dispnum}"
-    exit 1
-fi
-pid=$(${CAT} "/tmp/.X${dispnum}-lock")
-
-device=$(${FSTAT} -p ${pid} | ${GREP} ttyv | ${HEAD} -1 | ${AWK} '{print $8}')
-
-if [ -z "${device}" ]; then
-    echo "ERROR: Failed to find TTY device for X server on display ${dispnum}"
-    exit 1
-fi
-
-echo "/dev/${device}"
diff --git a/sysutils/consolekit/files/ck-get-x11-server-pid b/sysutils/consolekit/files/ck-get-x11-server-pid
deleted file mode 100644
index 05c433e01..000000000
--- a/sysutils/consolekit/files/ck-get-x11-server-pid
+++ /dev/null
@@ -1,17 +0,0 @@
-#!/bin/sh
-
-SED="/usr/bin/sed"
-CAT="/bin/cat"
-
-dispnum=0
-if [ ! -z "${DISPLAY}" ]; then
-    dispnum=$(echo ${DISPLAY} | ${SED} -E -e 's|:([0-9]+).*|\1|')
-fi
-
-if [ ! -f "/tmp/.X${dispnum}-lock" ]; then
-    echo "ERROR: Failed to find X lock file for display ${dispnum}"
-    exit 1
-fi
-pid=$(${CAT} "/tmp/.X${dispnum}-lock")
-
-echo ${pid}
diff --git a/sysutils/consolekit/files/patch-src_ck-sysdeps-freebsd.c b/sysutils/consolekit/files/patch-src_ck-sysdeps-freebsd.c
deleted file mode 100644
index 5a0e1248b..000000000
--- a/sysutils/consolekit/files/patch-src_ck-sysdeps-freebsd.c
+++ /dev/null
@@ -1,142 +0,0 @@
---- src/ck-sysdeps-freebsd.c.orig        2008-01-23 09:30:44.000000000 -0500
-+++ src/ck-sysdeps-freebsd.c        2008-02-06 22:50:57.000000000 -0500
-@@ -27,6 +27,7 @@
- #include <unistd.h>
- #include <string.h>
- #include <errno.h>
-+#include <glob.h>
- #include <paths.h>
- #include <ttyent.h>
- #include <kvm.h>
-@@ -202,7 +203,6 @@ ck_process_stat_new_for_unix_pid (pid_t 
-                                   GError        **error)
- {
-         gboolean       res;
--        GError        *local_error;
-         CkProcessStat *proc;
- 
-         g_return_val_if_fail (pid > 1, FALSE);
-@@ -217,7 +217,6 @@ ck_process_stat_new_for_unix_pid (pid_t 
-         if (res) {
-                 *stat = proc;
-         } else {
--                g_propagate_error (error, local_error);
-                 *stat = NULL;
-         }
- 
-@@ -318,38 +317,40 @@ gboolean
- ck_get_max_num_consoles (guint *num)
- {
-         int      max_consoles;
--        int      res;
--        gboolean ret;
--        struct ttyent *t;
-+        int      i;
-+        glob_t   g;
- 
--        ret = FALSE;
-         max_consoles = 0;
- 
--        res = setttyent ();
--        if (res == 0) {
--                goto done;
--        }
--
--        while ((t = getttyent ()) != NULL) {
--                if (t->ty_status & TTY_ON && strncmp (t->ty_name, "ttyv", 4) == 0)
-+        g.gl_offs = 0;
-+        glob ("/dev/ttyv*", GLOB_DOOFFS, NULL, &g);
-+        for (i = 0; i < g.gl_pathc && g.gl_pathv[i] != NULL; i++) {
-+                int fd;
-+                char *cdev;
-+
-+                cdev = g.gl_pathv[i];
-+                fd = open (cdev, O_RDONLY | O_NOCTTY);
-+                if (fd > -1) {
-+                        close (fd);
-                         max_consoles++;
-+                } else {
-+                        break;
-+                }
-         }
- 
--        /* Increment one more so that all consoles are properly counted
-+        globfree (&g);
-+
-+        /*
-+         * Increment one more so that all consoles are properly counted
-          * this is arguable a bug in vt_add_watches().
-          */
-         max_consoles++;
- 
--        ret = TRUE;
--
--        endttyent ();
--
--done:
-         if (num != NULL) {
-                 *num = max_consoles;
-         }
- 
--        return ret;
-+        return TRUE;
- }
- 
- char *
-@@ -360,7 +361,12 @@ ck_get_console_device_for_num (guint num
-         /* The device number is always one less than the VT number. */
-         num--;
- 
--        device = g_strdup_printf ("/dev/ttyv%u", num);
-+        if (num < 10)
-+                device = g_strdup_printf ("/dev/ttyv%i", num);
-+        else if (num < 32)
-+                device = g_strdup_printf ("/dev/ttyv%c", num - 10 + 'a');
-+        else
-+                device = NULL;
- 
-         return device;
- }
-@@ -370,6 +376,7 @@ ck_get_console_num_from_device (const ch
-                                 guint      *num)
- {
-         guint    n;
-+        char     c;
-         gboolean ret;
- 
-         n = 0;
-@@ -379,7 +386,11 @@ ck_get_console_num_from_device (const ch
-                 return FALSE;
-         }
- 
--        if (sscanf (device, "/dev/ttyv%u", &n) == 1) {
-+        if (sscanf (device, "/dev/ttyv%c", &c) == 1) {
-+                if (c < 58)
-+                        n = c - 48;
-+                else
-+                        n = c - 'a' + 10;
-                 /* The VT number is always one more than the device number. */
-                 n++;
-                 ret = TRUE;
-@@ -399,6 +410,7 @@ ck_get_active_console_num (int    consol
-         gboolean ret;
-         int      res;
-         int      active;
-+        char      ttyn;
- 
-         g_assert (console_fd != -1);
- 
-@@ -411,7 +423,12 @@ ck_get_active_console_num (int    consol
-                 goto out;
-         }
- 
--        g_debug ("Active VT is: %d (ttyv%d)", active, active - 1);
-+        if (active - 1 < 10)
-+                ttyn = active - 1 + '0';
-+        else
-+                ttyn = active - 11 + 'a';
-+
-+        g_debug ("Active VT is: %d (ttyv%c)", active, ttyn);
-         ret = TRUE;
- 
-  out:
diff --git a/sysutils/consolekit/files/patch-src_ck-sysdeps-unix.c b/sysutils/consolekit/files/patch-src_ck-sysdeps-unix.c
deleted file mode 100644
index e256e9f36..000000000
--- a/sysutils/consolekit/files/patch-src_ck-sysdeps-unix.c
+++ /dev/null
@@ -1,18 +0,0 @@
---- src/ck-sysdeps-unix.c.orig	2008-02-06 22:59:55.000000000 -0500
-+++ src/ck-sysdeps-unix.c	2008-02-06 22:52:34.000000000 -0500
-@@ -172,6 +172,15 @@ ck_get_a_console_fd (void)
- 
-         fd = -1;
- 
-+#ifdef __FreeBSD__
-+	/* On FreeBSD, try /dev/consolectl first as this will survive
-+	 * /etc/ttys initialization. */
-+	fd = open_a_console ("/dev/consolectl");
-+	if (fd >= 0) {
-+		goto done;
-+	}
-+#endif
-+
- #ifdef __sun
-         /* On Solaris, first try Sun VT device. */
-         fd = open_a_console ("/dev/vt/active");
diff --git a/sysutils/consolekit/files/patch-src_main.c b/sysutils/consolekit/files/patch-src_main.c
deleted file mode 100644
index a791db0f9..000000000
--- a/sysutils/consolekit/files/patch-src_main.c
+++ /dev/null
@@ -1,33 +0,0 @@
---- src/main.c.orig        2007-11-08 15:05:55.000000000 -0500
-+++ src/main.c        2007-11-08 15:07:39.000000000 -0500
-@@ -226,6 +226,21 @@ sigusr1_handler (int sig)
- }
- 
- static void
-+setup_termination_signals (void)
-+{
-+        struct sigaction sa;
-+
-+        sa.sa_handler = SIG_DFL;
-+        sigemptyset (&sa.sa_mask);
-+        sa.sa_flags = 0;
-+
-+        sigaction (SIGTERM, &sa, NULL);
-+        sigaction (SIGQUIT, &sa, NULL);
-+        sigaction (SIGINT, &sa, NULL);
-+        sigaction (SIGHUP, &sa, NULL);
-+}
-+
-+static void
- setup_debug_log_signals (void)
- {
-         struct sigaction sa;
-@@ -300,6 +315,8 @@ main (int    argc,
- 
-         setup_debug_log (debug);
- 
-+        setup_termination_signals ();
-+
-         connection = get_system_bus ();
-         if (connection == NULL) {
-                 goto out;
diff --git a/sysutils/consolekit/files/patch-src_test-vt-monitor.c b/sysutils/consolekit/files/patch-src_test-vt-monitor.c
deleted file mode 100644
index 6fb9740f5..000000000
--- a/sysutils/consolekit/files/patch-src_test-vt-monitor.c
+++ /dev/null
@@ -1,33 +0,0 @@
---- src/test-vt-monitor.c.orig	2007-08-17 13:08:55.000000000 -0400
-+++ src/test-vt-monitor.c	2007-11-08 15:11:37.000000000 -0500
-@@ -31,6 +31,7 @@
- #include <pwd.h>
- #include <string.h>
- #include <errno.h>
-+#include <signal.h>
- 
- #include <locale.h>
- 
-@@ -55,12 +56,22 @@ main (int argc, char **argv)
-         GError           *error;
-         guint             num;
-         gboolean          res;
-+	struct sigaction  sa;
- 
-         if (! g_thread_supported ()) {
-                 g_thread_init (NULL);
-         }
-         g_type_init ();
- 
-+	sa.sa_handler = SIG_DFL;
-+	sigemptyset (&sa.sa_mask);
-+	sa.sa_flags = 0;
-+
-+	sigaction (SIGINT,  &sa, NULL);
-+	sigaction (SIGTERM, &sa, NULL);
-+	sigaction (SIGQUIT, &sa, NULL);
-+	sigaction (SIGHUP,  &sa, NULL);
-+
-         if (! ck_is_root_user ()) {
-                 g_warning ("Must be run as root");
-                 exit (1);
diff --git a/sysutils/consolekit/files/patch-tools_Makefile.in b/sysutils/consolekit/files/patch-tools_Makefile.in
deleted file mode 100644
index b818fd931..000000000
--- a/sysutils/consolekit/files/patch-tools_Makefile.in
+++ /dev/null
@@ -1,77 +0,0 @@
---- tools/Makefile.in.orig	2008-01-31 16:09:08.000000000 -0500
-+++ tools/Makefile.in	2008-01-31 16:10:21.000000000 -0500
-@@ -39,8 +39,7 @@ bin_PROGRAMS = ck-list-sessions$(EXEEXT)
- 	$(am__EXEEXT_1)
- sbin_PROGRAMS = ck-log-system-start$(EXEEXT) $(am__EXEEXT_1)
- libexec_PROGRAMS = ck-collect-session-info$(EXEEXT) \
--	ck-get-x11-server-pid$(EXEEXT) \
--	ck-get-x11-display-device$(EXEEXT) $(am__EXEEXT_1)
-+	$(am__EXEEXT_1)
- subdir = tools
- DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in
- ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
-@@ -66,17 +65,6 @@ ck_collect_session_info_OBJECTS =  \
- am__DEPENDENCIES_1 =
- ck_collect_session_info_DEPENDENCIES = $(am__DEPENDENCIES_1) \
- 	$(top_builddir)/src/libck.la $(am__DEPENDENCIES_1)
--am_ck_get_x11_display_device_OBJECTS =  \
--	ck-get-x11-display-device.$(OBJEXT) $(am__objects_1)
--ck_get_x11_display_device_OBJECTS =  \
--	$(am_ck_get_x11_display_device_OBJECTS)
--ck_get_x11_display_device_DEPENDENCIES = $(am__DEPENDENCIES_1) \
--	$(top_builddir)/src/libck.la $(am__DEPENDENCIES_1)
--am_ck_get_x11_server_pid_OBJECTS = ck-get-x11-server-pid.$(OBJEXT) \
--	$(am__objects_1)
--ck_get_x11_server_pid_OBJECTS = $(am_ck_get_x11_server_pid_OBJECTS)
--ck_get_x11_server_pid_DEPENDENCIES = $(am__DEPENDENCIES_1) \
--	$(top_builddir)/src/libck.la $(am__DEPENDENCIES_1)
- am_ck_history_OBJECTS = ck-history.$(OBJEXT) $(am__objects_1)
- ck_history_OBJECTS = $(am_ck_history_OBJECTS)
- ck_history_DEPENDENCIES = $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \
-@@ -335,24 +323,6 @@ ck_collect_session_info_LDADD = \
- 	$(top_builddir)/src/libck.la	\
- 	$(NULL)
- 
--ck_get_x11_server_pid_SOURCES = \
--	ck-get-x11-server-pid.c		\
--	$(NULL)
--
--ck_get_x11_server_pid_LDADD = \
--	$(TOOLS_LIBS)			\
--	$(top_builddir)/src/libck.la	\
--	$(NULL)
--
--ck_get_x11_display_device_SOURCES = \
--	ck-get-x11-display-device.c	\
--	$(NULL)
--
--ck_get_x11_display_device_LDADD = \
--	$(TOOLS_LIBS)			\
--	$(top_builddir)/src/libck.la	\
--	$(NULL)
--
- EXTRA_DIST = \
- 	$(NULL)
- 
-@@ -480,12 +450,6 @@ clean-sbinPROGRAMS:
- ck-collect-session-info$(EXEEXT): $(ck_collect_session_info_OBJECTS) $(ck_collect_session_info_DEPENDENCIES) 
- 	@rm -f ck-collect-session-info$(EXEEXT)
- 	$(LINK) $(ck_collect_session_info_OBJECTS) $(ck_collect_session_info_LDADD) $(LIBS)
--ck-get-x11-display-device$(EXEEXT): $(ck_get_x11_display_device_OBJECTS) $(ck_get_x11_display_device_DEPENDENCIES) 
--	@rm -f ck-get-x11-display-device$(EXEEXT)
--	$(LINK) $(ck_get_x11_display_device_OBJECTS) $(ck_get_x11_display_device_LDADD) $(LIBS)
--ck-get-x11-server-pid$(EXEEXT): $(ck_get_x11_server_pid_OBJECTS) $(ck_get_x11_server_pid_DEPENDENCIES) 
--	@rm -f ck-get-x11-server-pid$(EXEEXT)
--	$(LINK) $(ck_get_x11_server_pid_OBJECTS) $(ck_get_x11_server_pid_LDADD) $(LIBS)
- ck-history$(EXEEXT): $(ck_history_OBJECTS) $(ck_history_DEPENDENCIES) 
- 	@rm -f ck-history$(EXEEXT)
- 	$(LINK) $(ck_history_OBJECTS) $(ck_history_LDADD) $(LIBS)
-@@ -503,8 +467,6 @@ distclean-compile:
- 	-rm -f *.tab.c
- 
- @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/ck-collect-session-info.Po@am__quote@
--@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/ck-get-x11-display-device.Po@am__quote@
--@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/ck-get-x11-server-pid.Po@am__quote@
- @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/ck-history.Po@am__quote@
- @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/ck-log-system-start.Po@am__quote@
- @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/list-sessions.Po@am__quote@
diff --git a/sysutils/consolekit/pkg-descr b/sysutils/consolekit/pkg-descr
deleted file mode 100644
index db13002ab..000000000
--- a/sysutils/consolekit/pkg-descr
+++ /dev/null
@@ -1,6 +0,0 @@
-ConsoleKit is a framework for defining and tracking users, login
-sessions, and seats.  The primary motivations for this framework are to
-facilitate fast-user-switching and multi-seat capabilities, and to
-enable more sophisticated policy decisions for desktop sessions.
-
-WWW: http://www.freedesktop.org/wiki/Software/ConsoleKit
diff --git a/sysutils/consolekit/pkg-plist b/sysutils/consolekit/pkg-plist
deleted file mode 100644
index 4b7573421..000000000
--- a/sysutils/consolekit/pkg-plist
+++ /dev/null
@@ -1,36 +0,0 @@
-bin/ck-history
-bin/ck-launch-session
-bin/ck-list-sessions
-sbin/ck-log-system-restart
-sbin/ck-log-system-start
-sbin/ck-log-system-stop
-etc/ConsoleKit/seats.d/00-primary.seat
-etc/dbus-1/system.d/ConsoleKit.conf
-include/ConsoleKit/ck-connector/ck-connector.h
-lib/ConsoleKit/scripts/ck-system-restart
-lib/ConsoleKit/scripts/ck-system-stop
-lib/libck-connector.la
-lib/libck-connector.so
-lib/libck-connector.so.0
-libdata/pkgconfig/ck-connector.pc
-libexec/ck-collect-session-info
-libexec/ck-get-x11-display-device
-libexec/ck-get-x11-server-pid
-sbin/console-kit-daemon
-share/PolicyKit/policy/ConsoleKit.policy
-share/dbus-1/system-services/org.freedesktop.ConsoleKit.service
-@exec %D/etc/ConsoleKit/run-session.d
-@exec mkdir -p %D/lib/ConsoleKit/run-session.d
-@dirrm lib/ConsoleKit/scripts
-@dirrmtry lib/ConsoleKit/run-session.d
-@dirrmtry lib/ConsoleKit
-@dirrm include/ConsoleKit/ck-connector
-@dirrm include/ConsoleKit
-@dirrm etc/ConsoleKit/seats.d
-@dirrmtry etc/ConsoleKit/run-session.d
-@dirrm etc/ConsoleKit
-@exec mkdir -p /var/run/ConsoleKit
-@exec mkdir -p /var/log/ConsoleKit
-@exec touch -f /var/log/ConsoleKit/history
-@unexec rm -rf /var/run/ConsoleKit 2>/dev/null || true
-@unexec rm -rf /var/log/ConsoleKit 2>/dev/null || true
diff --git a/sysutils/eiciel/Makefile b/sysutils/eiciel/Makefile
deleted file mode 100644
index 4767249e1..000000000
--- a/sysutils/eiciel/Makefile
+++ /dev/null
@@ -1,37 +0,0 @@
-# New ports collection makefile for:	eiciel
-# Date created:				July 20, 2005
-# Whom:					andreas@syndrom23.de
-#
-# $FreeBSD$
-#
-
-PORTNAME=	eiciel
-PORTVERSION=	0.9.5.1
-CATEGORIES=	sysutils security
-MASTER_SITES=	http://rofi.roger-ferrer.org/eiciel/download/
-
-MAINTAINER=	ports@FreeBSD.org
-COMMENT=	A GNOME-based ACL editor, with integration into Nautilus
-
-LIB_DEPENDS=	gtkmm-2.4.1:${PORTSDIR}/x11-toolkits/gtkmm24
-
-BROKEN=		Need to be update with new Nautilus 2.22
-
-USE_BZIP2=	yes
-USE_GNOME=	gnomehack gnomeprefix intlhack nautilus2
-USE_GETTEXT=	yes
-USE_GMAKE=	yes
-USE_AUTOTOOLS=	libtool:15
-CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" \
-		LDFLAGS="-L${LOCALBASE}/lib"
-
-MAN1=		eiciel.1
-
-post-patch:
-	@${REINPLACE_CMD} -e '/^libeiciel_nautilus_la_LDFLAGS/ s|= |= -avoid-version -module |' \
-		${WRKSRC}/src/Makefile.in
-
-post-install:
-	@${CAT} ${PKGMESSAGE}
-
-.include <bsd.port.mk>
diff --git a/sysutils/eiciel/distinfo b/sysutils/eiciel/distinfo
deleted file mode 100644
index 3747ce2d1..000000000
--- a/sysutils/eiciel/distinfo
+++ /dev/null
@@ -1,3 +0,0 @@
-MD5 (eiciel-0.9.5.1.tar.bz2) = ccee80921789f7b8c5657fc1aadd4e3f
-SHA256 (eiciel-0.9.5.1.tar.bz2) = 7394dbaa53e1a5b251c0ba60e903d8addf2de63d0fa30ef66b68cfba0d7b3dd0
-SIZE (eiciel-0.9.5.1.tar.bz2) = 577616
diff --git a/sysutils/eiciel/pkg-descr b/sysutils/eiciel/pkg-descr
deleted file mode 100644
index 4e72a1c9a..000000000
--- a/sysutils/eiciel/pkg-descr
+++ /dev/null
@@ -1,5 +0,0 @@
-Eiciel allows you to visually edit file ACL entries. You can add and remove 
-users and groups who will be granted permissions through the graphical 
-interface.
-
-WWW: http://rofi.pinchito.com/eiciel/
diff --git a/sysutils/eiciel/pkg-message b/sysutils/eiciel/pkg-message
deleted file mode 100644
index 606ad447a..000000000
--- a/sysutils/eiciel/pkg-message
+++ /dev/null
@@ -1,6 +0,0 @@
-===============================================================================
-To use the eiciel Nautilus extension, Nautilus has to be restarted.
-
-ACLs are not enabled by default. To enable them, use "tunefs -a" (only works
-on unmounted file systems) or the "acls" mount(8) option.
-===============================================================================
diff --git a/sysutils/eiciel/pkg-plist b/sysutils/eiciel/pkg-plist
deleted file mode 100644
index ae437ab24..000000000
--- a/sysutils/eiciel/pkg-plist
+++ /dev/null
@@ -1,52 +0,0 @@
-bin/eiciel
-lib/nautilus/extensions-1.0/libeiciel-nautilus.a
-lib/nautilus/extensions-1.0/libeiciel-nautilus.la
-lib/nautilus/extensions-1.0/libeiciel-nautilus.so
-share/applications/eiciel.desktop
-%%DATADIR%%/img/altres-default.png
-%%DATADIR%%/img/altres.png
-%%DATADIR%%/img/grup-acl-default.png
-%%DATADIR%%/img/grup-acl.png
-%%DATADIR%%/img/grup-default.png
-%%DATADIR%%/img/grup.png
-%%DATADIR%%/img/icona_eiciel_16.png
-%%DATADIR%%/img/icona_eiciel_24.png
-%%DATADIR%%/img/icona_eiciel_32.png
-%%DATADIR%%/img/icona_eiciel_48.png
-%%DATADIR%%/img/icona_eiciel_64.png
-%%DATADIR%%/img/mascara-default.png
-%%DATADIR%%/img/mascara.png
-%%DATADIR%%/img/usuari-acl-default.png
-%%DATADIR%%/img/usuari-acl.png
-%%DATADIR%%/img/usuari-default.png
-%%DATADIR%%/img/usuari.png
-share/gnome/help/eiciel/C/eiciel.xml
-share/gnome/help/eiciel/C/figures/altres-default.png
-share/gnome/help/eiciel/C/figures/altres.png
-share/gnome/help/eiciel/C/figures/detall_mascara.png
-share/gnome/help/eiciel/C/figures/entrada_acl.png
-share/gnome/help/eiciel/C/figures/grup-acl-default.png
-share/gnome/help/eiciel/C/figures/grup-acl.png
-share/gnome/help/eiciel/C/figures/grup-default.png
-share/gnome/help/eiciel/C/figures/grup.png
-share/gnome/help/eiciel/C/figures/mascara-default.png
-share/gnome/help/eiciel/C/figures/mascara.png
-share/gnome/help/eiciel/C/figures/obrir_fitxer.png
-share/gnome/help/eiciel/C/figures/obrir_fitxer_nautilus.png
-share/gnome/help/eiciel/C/figures/pantalla_ea.png
-share/gnome/help/eiciel/C/figures/permisos_acl.png
-share/gnome/help/eiciel/C/figures/permisos_ugo.png
-share/gnome/help/eiciel/C/figures/usuari-acl-default.png
-share/gnome/help/eiciel/C/figures/usuari-acl.png
-share/gnome/help/eiciel/C/figures/usuari-default.png
-share/gnome/help/eiciel/C/figures/usuari.png
-share/locale/ca/LC_MESSAGES/eiciel.mo
-share/locale/de/LC_MESSAGES/eiciel.mo
-share/locale/es/LC_MESSAGES/eiciel.mo
-share/locale/sv/LC_MESSAGES/eiciel.mo
-@dirrm %%DATADIR%%/img
-@dirrm %%DATADIR%%
-@dirrm share/gnome/help/eiciel/C/figures
-@dirrm share/gnome/help/eiciel/C
-@dirrm share/gnome/help/eiciel
-@dirrmtry share/applications
diff --git a/sysutils/gconf-editor/Makefile b/sysutils/gconf-editor/Makefile
deleted file mode 100644
index 43cfe5591..000000000
--- a/sysutils/gconf-editor/Makefile
+++ /dev/null
@@ -1,33 +0,0 @@
-# New ports collection makefile for:	gconf-editor
-# Date created:				12 May 2002
-# Whom:					Joe Marcus Clarke <marcus@FreeBSD.org>
-#
-# $FreeBSD$
-#   $MCom$
-#
-
-PORTNAME=	gconf-editor
-PORTVERSION=	2.22.0
-PORTEPOCH=	1
-CATEGORIES=	sysutils gnome
-MASTER_SITES=	GNOME
-DIST_SUBDIR=	gnome2
-
-MAINTAINER=	gnome@FreeBSD.org
-COMMENT=	A gconf database editor for the GNOME 2 environment
-
-USE_BZIP2=	yes
-USE_GETTEXT=	yes
-USE_XLIB=	yes
-INSTALLS_OMF=	yes
-INSTALLS_ICONS=	yes
-USE_GMAKE=	yes
-USE_GNOME=	gnomeprefix intlhack gnomehack libgnomeui gnomedocutils
-GNU_CONFIGURE=	yes
-CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" \
-		LDFLAGS="-L${LOCALBASE}/lib"
-
-MAN1=		gconf-editor.1
-GCONF_SCHEMAS=	gconf-editor.schemas
-
-.include <bsd.port.mk>
diff --git a/sysutils/gconf-editor/distinfo b/sysutils/gconf-editor/distinfo
deleted file mode 100644
index 45fda8d93..000000000
--- a/sysutils/gconf-editor/distinfo
+++ /dev/null
@@ -1,3 +0,0 @@
-MD5 (gnome2/gconf-editor-2.22.0.tar.bz2) = 7ca99aec214dd855b5de7dacc8937055
-SHA256 (gnome2/gconf-editor-2.22.0.tar.bz2) = e701134a1f5293070ca7d8d6311468f61e3a9765ebc520fcca6a0a38b214b7dc
-SIZE (gnome2/gconf-editor-2.22.0.tar.bz2) = 873868
diff --git a/sysutils/gconf-editor/pkg-descr b/sysutils/gconf-editor/pkg-descr
deleted file mode 100644
index 0c8d23c9b..000000000
--- a/sysutils/gconf-editor/pkg-descr
+++ /dev/null
@@ -1,2 +0,0 @@
-gconf-editor is a GNOME 2 GConf database editor.  It is analogous to
-regedit on Windows.
diff --git a/sysutils/gconf-editor/pkg-plist b/sysutils/gconf-editor/pkg-plist
deleted file mode 100644
index 817b8e2af..000000000
--- a/sysutils/gconf-editor/pkg-plist
+++ /dev/null
@@ -1,164 +0,0 @@
-bin/gconf-editor
-share/applications/gconf-editor.desktop
-share/gnome/help/gconf-editor/C/figures/gconf_editor_anno_window.png
-share/gnome/help/gconf-editor/C/gconf-editor.xml
-share/gnome/help/gconf-editor/C/legal.xml
-share/gnome/help/gconf-editor/de/figures/gconf_editor_anno_window.png
-share/gnome/help/gconf-editor/de/gconf-editor.xml
-share/gnome/help/gconf-editor/es/figures/gconf_editor_anno_window.png
-share/gnome/help/gconf-editor/es/gconf-editor.xml
-share/gnome/help/gconf-editor/fr/figures/gconf_editor_anno_window.png
-share/gnome/help/gconf-editor/fr/gconf-editor.xml
-share/gnome/help/gconf-editor/it/figures/gconf_editor_anno_window.png
-share/gnome/help/gconf-editor/it/gconf-editor.xml
-share/gnome/help/gconf-editor/oc/figures/gconf_editor_anno_window.png
-share/gnome/help/gconf-editor/oc/gconf-editor.xml
-share/gnome/help/gconf-editor/sv/figures/gconf_editor_anno_window.png
-share/gnome/help/gconf-editor/sv/gconf-editor.xml
-share/gnome/help/gconf-editor/uk/figures/gconf_editor_anno_window.png
-share/gnome/help/gconf-editor/uk/gconf-editor.xml
-share/icons/hicolor/48x48/apps/gconf-editor.png
-share/locale/am/LC_MESSAGES/gconf-editor.mo
-share/locale/ar/LC_MESSAGES/gconf-editor.mo
-share/locale/as/LC_MESSAGES/gconf-editor.mo
-share/locale/az/LC_MESSAGES/gconf-editor.mo
-share/locale/be/LC_MESSAGES/gconf-editor.mo
-share/locale/be@latin/LC_MESSAGES/gconf-editor.mo
-share/locale/bg/LC_MESSAGES/gconf-editor.mo
-share/locale/bn/LC_MESSAGES/gconf-editor.mo
-share/locale/bn_IN/LC_MESSAGES/gconf-editor.mo
-share/locale/br/LC_MESSAGES/gconf-editor.mo
-share/locale/bs/LC_MESSAGES/gconf-editor.mo
-share/locale/ca/LC_MESSAGES/gconf-editor.mo
-share/locale/cs/LC_MESSAGES/gconf-editor.mo
-share/locale/cy/LC_MESSAGES/gconf-editor.mo
-share/locale/da/LC_MESSAGES/gconf-editor.mo
-share/locale/de/LC_MESSAGES/gconf-editor.mo
-share/locale/dz/LC_MESSAGES/gconf-editor.mo
-share/locale/el/LC_MESSAGES/gconf-editor.mo
-share/locale/en_CA/LC_MESSAGES/gconf-editor.mo
-share/locale/en_GB/LC_MESSAGES/gconf-editor.mo
-share/locale/es/LC_MESSAGES/gconf-editor.mo
-share/locale/et/LC_MESSAGES/gconf-editor.mo
-share/locale/eu/LC_MESSAGES/gconf-editor.mo
-share/locale/fa/LC_MESSAGES/gconf-editor.mo
-share/locale/fi/LC_MESSAGES/gconf-editor.mo
-share/locale/fr/LC_MESSAGES/gconf-editor.mo
-share/locale/ga/LC_MESSAGES/gconf-editor.mo
-share/locale/gl/LC_MESSAGES/gconf-editor.mo
-share/locale/gu/LC_MESSAGES/gconf-editor.mo
-share/locale/he/LC_MESSAGES/gconf-editor.mo
-share/locale/hi/LC_MESSAGES/gconf-editor.mo
-share/locale/hr/LC_MESSAGES/gconf-editor.mo
-share/locale/hu/LC_MESSAGES/gconf-editor.mo
-share/locale/id/LC_MESSAGES/gconf-editor.mo
-share/locale/it/LC_MESSAGES/gconf-editor.mo
-share/locale/ja/LC_MESSAGES/gconf-editor.mo
-share/locale/ka/LC_MESSAGES/gconf-editor.mo
-share/locale/kn/LC_MESSAGES/gconf-editor.mo
-share/locale/ko/LC_MESSAGES/gconf-editor.mo
-share/locale/ku/LC_MESSAGES/gconf-editor.mo
-share/locale/li/LC_MESSAGES/gconf-editor.mo
-share/locale/lt/LC_MESSAGES/gconf-editor.mo
-share/locale/lv/LC_MESSAGES/gconf-editor.mo
-share/locale/mg/LC_MESSAGES/gconf-editor.mo
-share/locale/mk/LC_MESSAGES/gconf-editor.mo
-share/locale/ml/LC_MESSAGES/gconf-editor.mo
-share/locale/mn/LC_MESSAGES/gconf-editor.mo
-share/locale/mr/LC_MESSAGES/gconf-editor.mo
-share/locale/ms/LC_MESSAGES/gconf-editor.mo
-share/locale/nb/LC_MESSAGES/gconf-editor.mo
-share/locale/ne/LC_MESSAGES/gconf-editor.mo
-share/locale/nl/LC_MESSAGES/gconf-editor.mo
-share/locale/nn/LC_MESSAGES/gconf-editor.mo
-share/locale/oc/LC_MESSAGES/gconf-editor.mo
-share/locale/or/LC_MESSAGES/gconf-editor.mo
-share/locale/pa/LC_MESSAGES/gconf-editor.mo
-share/locale/pl/LC_MESSAGES/gconf-editor.mo
-share/locale/pt/LC_MESSAGES/gconf-editor.mo
-share/locale/pt_BR/LC_MESSAGES/gconf-editor.mo
-share/locale/ro/LC_MESSAGES/gconf-editor.mo
-share/locale/ru/LC_MESSAGES/gconf-editor.mo
-share/locale/rw/LC_MESSAGES/gconf-editor.mo
-share/locale/si/LC_MESSAGES/gconf-editor.mo
-share/locale/sk/LC_MESSAGES/gconf-editor.mo
-share/locale/sl/LC_MESSAGES/gconf-editor.mo
-share/locale/sq/LC_MESSAGES/gconf-editor.mo
-share/locale/sr/LC_MESSAGES/gconf-editor.mo
-share/locale/sr@Latn/LC_MESSAGES/gconf-editor.mo
-share/locale/sv/LC_MESSAGES/gconf-editor.mo
-share/locale/ta/LC_MESSAGES/gconf-editor.mo
-share/locale/te/LC_MESSAGES/gconf-editor.mo
-share/locale/th/LC_MESSAGES/gconf-editor.mo
-share/locale/tr/LC_MESSAGES/gconf-editor.mo
-share/locale/ug/LC_MESSAGES/gconf-editor.mo
-share/locale/uk/LC_MESSAGES/gconf-editor.mo
-share/locale/vi/LC_MESSAGES/gconf-editor.mo
-share/locale/xh/LC_MESSAGES/gconf-editor.mo
-share/locale/zh_CN/LC_MESSAGES/gconf-editor.mo
-share/locale/zh_HK/LC_MESSAGES/gconf-editor.mo
-share/locale/zh_TW/LC_MESSAGES/gconf-editor.mo
-share/omf/gconf-editor/gconf-editor-C.omf
-share/omf/gconf-editor/gconf-editor-de.omf
-share/omf/gconf-editor/gconf-editor-es.omf
-share/omf/gconf-editor/gconf-editor-fr.omf
-share/omf/gconf-editor/gconf-editor-it.omf
-share/omf/gconf-editor/gconf-editor-oc.omf
-share/omf/gconf-editor/gconf-editor-sv.omf
-share/omf/gconf-editor/gconf-editor-uk.omf
-share/pixmaps/gconf-editor/entry-blank.png
-share/pixmaps/gconf-editor/entry-bool.png
-share/pixmaps/gconf-editor/entry-list.png
-share/pixmaps/gconf-editor/entry-number.png
-share/pixmaps/gconf-editor/entry-schema.png
-share/pixmaps/gconf-editor/entry-string.png
-share/pixmaps/gconf-editor/folder-closed.png
-share/pixmaps/gconf-editor/folder-open.png
-@dirrm share/pixmaps/gconf-editor
-@dirrm share/omf/gconf-editor
-@dirrm share/gnome/help/gconf-editor/uk/figures
-@dirrm share/gnome/help/gconf-editor/uk
-@dirrm share/gnome/help/gconf-editor/sv/figures
-@dirrm share/gnome/help/gconf-editor/sv
-@dirrm share/gnome/help/gconf-editor/oc/figures
-@dirrm share/gnome/help/gconf-editor/oc
-@dirrm share/gnome/help/gconf-editor/it/figures
-@dirrm share/gnome/help/gconf-editor/it
-@dirrm share/gnome/help/gconf-editor/fr/figures
-@dirrm share/gnome/help/gconf-editor/fr
-@dirrm share/gnome/help/gconf-editor/es/figures
-@dirrm share/gnome/help/gconf-editor/es
-@dirrm share/gnome/help/gconf-editor/de/figures
-@dirrm share/gnome/help/gconf-editor/de
-@dirrm share/gnome/help/gconf-editor/C/figures
-@dirrm share/gnome/help/gconf-editor/C
-@dirrm share/gnome/help/gconf-editor
-@dirrmtry share/applications
-@dirrmtry share/locale/zh_HK/LC_MESSAGES
-@dirrmtry share/locale/zh_HK
-@dirrmtry share/locale/xh/LC_MESSAGES
-@dirrmtry share/locale/xh
-@dirrmtry share/locale/ug/LC_MESSAGES
-@dirrmtry share/locale/ug
-@dirrmtry share/locale/te/LC_MESSAGES
-@dirrmtry share/locale/te
-@dirrmtry share/locale/si/LC_MESSAGES
-@dirrmtry share/locale/si
-@dirrmtry share/locale/rw/LC_MESSAGES
-@dirrmtry share/locale/rw
-@dirrmtry share/locale/oc/LC_MESSAGES
-@dirrmtry share/locale/oc
-@dirrmtry share/locale/mr/LC_MESSAGES
-@dirrmtry share/locale/mr
-@dirrmtry share/locale/mg/LC_MESSAGES
-@dirrmtry share/locale/mg
-@dirrmtry share/locale/ku/LC_MESSAGES
-@dirrmtry share/locale/ku
-@dirrmtry share/locale/dz/LC_MESSAGES
-@dirrmtry share/locale/dz
-@dirrmtry share/locale/bn_IN/LC_MESSAGES
-@dirrmtry share/locale/bn_IN
-@dirrmtry share/locale/be@latin/LC_MESSAGES
-@dirrmtry share/locale/be@latin
-@dirrmtry share/locale/as/LC_MESSAGES
-@dirrmtry share/locale/as
diff --git a/sysutils/gnome-control-center/Makefile b/sysutils/gnome-control-center/Makefile
deleted file mode 100644
index 9c570ee30..000000000
--- a/sysutils/gnome-control-center/Makefile
+++ /dev/null
@@ -1,66 +0,0 @@
-# New ports collection makefile for:	gnomecontrolcenter2
-# Date created:				04 May 2002
-# Whom:					Joe Marcus Clarke <marcus@FreeBSD.org>
-#
-# $FreeBSD$
-#   $MCom: ports/sysutils/gnome-control-center/Makefile,v 1.171 2008/02/28 02:38:35 mezz Exp $
-#
-
-PORTNAME=	gnome-control-center
-PORTVERSION=	2.22.0
-CATEGORIES=	sysutils gnome
-MASTER_SITES=	GNOME
-DIST_SUBDIR=	gnome2
-
-MAINTAINER=	gnome@FreeBSD.org
-COMMENT=	Control center for GNOME 2 project
-
-LIB_DEPENDS=	xklavier.12:${PORTSDIR}/x11/libxklavier
-BUILD_DEPENDS=	${LOCALBASE}/libexec/gnome-settings-daemon:${PORTSDIR}/sysutils/gnome-settings-daemon
-RUN_DEPENDS=	gnome-eject:${PORTSDIR}/sysutils/gnome-mount \
-		${LOCALBASE}/libexec/gnome-settings-daemon:${PORTSDIR}/sysutils/gnome-settings-daemon
-
-USE_BZIP2=	yes
-USE_GETTEXT=	yes
-USE_XLIB=	yes
-USE_GMAKE=	yes
-GNOME_DESKTOP_VERSION=2
-USE_GSTREAMER=	good
-WANT_GNOME=	yes
-USE_GNOME=	gnomeprefix gnomehack intlhack metacity nautilus2 \
-		gnomemenus desktopfileutils libgnomekbd gnomepanel
-GNU_CONFIGURE=	yes
-INSTALLS_OMF=	yes
-INSTALLS_ICONS=	yes
-USE_LDCONFIG=	yes
-CONFIGURE_ARGS=	--enable-gstreamer=0.10
-CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" \
-		LDFLAGS="-L${LOCALBASE}/lib"
-
-GCONF_SCHEMAS=	control-center.schemas \
-		fontilus.schemas themus.schemas
-
-.if defined(PACKAGE_BUILDING)
-.undef WITHOUT_GNOME
-WITH_GNOME=	yes
-.endif
-
-.include <bsd.port.pre.mk>
-
-.if ${HAVE_GNOME:Mevolutiondataserver}!=""
-USE_GNOME+=	evolutiondataserver
-CONFIGURE_ARGS+=--enable-aboutme
-PLIST_SUB+=	ABOUTME=""
-.else
-CONFIGURE_ARGS+=--disable-aboutme
-PLIST_SUB+=	ABOUTME="@comment "
-.endif
-
-post-patch:
-	@${REINPLACE_CMD} -e 's|%%LOCALBASE%%|${LOCALBASE}|' \
-	    	${WRKSRC}/capplets/common/gnome-theme-info.c
-
-post-install:
-	@-update-desktop-database
-
-.include <bsd.port.post.mk>
diff --git a/sysutils/gnome-control-center/distinfo b/sysutils/gnome-control-center/distinfo
deleted file mode 100644
index ee7861862..000000000
--- a/sysutils/gnome-control-center/distinfo
+++ /dev/null
@@ -1,3 +0,0 @@
-MD5 (gnome2/gnome-control-center-2.22.0.tar.bz2) = e6730ac4ee8b14a577978dee6c1cb88f
-SHA256 (gnome2/gnome-control-center-2.22.0.tar.bz2) = 13e5cc7181b4c380921984a327ec2f8a48077a4f15319bbe6cf6985f44ff3af0
-SIZE (gnome2/gnome-control-center-2.22.0.tar.bz2) = 2176730
diff --git a/sysutils/gnome-control-center/files/patch-capplets_about-me_gnome-about-me-password.c b/sysutils/gnome-control-center/files/patch-capplets_about-me_gnome-about-me-password.c
deleted file mode 100644
index 69c01de97..000000000
--- a/sysutils/gnome-control-center/files/patch-capplets_about-me_gnome-about-me-password.c
+++ /dev/null
@@ -1,15 +0,0 @@
---- capplets/about-me/gnome-about-me-password.c.orig	Sun Jun 11 04:50:31 2006
-+++ capplets/about-me/gnome-about-me-password.c	Tue Jun 13 00:02:27 2006
-@@ -52,6 +52,12 @@
- #include <signal.h>
- #endif
- 
-+#if __FreeBSD__
-+#include <sys/types.h>
-+#include <libutil.h>
-+#include <signal.h>
-+#endif
-+
- #include "capplet-util.h"
- #include "eel-alert-dialog.h"
- 
diff --git a/sysutils/gnome-control-center/files/patch-capplets_common_gnome-theme-info.c b/sysutils/gnome-control-center/files/patch-capplets_common_gnome-theme-info.c
deleted file mode 100644
index ac875d14d..000000000
--- a/sysutils/gnome-control-center/files/patch-capplets_common_gnome-theme-info.c
+++ /dev/null
@@ -1,20 +0,0 @@
---- capplets/common/gnome-theme-info.c.orig	2007-10-30 18:58:26.000000000 -0400
-+++ capplets/common/gnome-theme-info.c	2007-11-01 08:43:25.067405773 -0400
-@@ -661,7 +661,7 @@
-     theme_info->thumbnail = gdk_pixbuf_new_from_file (filename, NULL);
-     g_free (filename);
- 
--    theme_info->path = g_build_filename (GNOMECC_DATA_DIR, builtins[i][0], NULL);
-+    theme_info->name = g_build_filename (INSTALL_PREFIX, "share", builtins[i][0], NULL);
-     theme_info->name = g_strdup (theme_info->path);
- 
-     if (!strcmp (theme_info->path, cursor_font))
-@@ -1922,7 +1922,7 @@
-   gnome_vfs_uri_unref (top_theme_dir_uri);
- 
-   /* The weird /usr/share/icons */
--  top_theme_dir_uri = gnome_vfs_uri_new ("/usr/share/icons");
-+  top_theme_dir_uri = gnome_vfs_uri_new ("%%LOCALBASE%%/lib/X11/icons");
-   if (!gnome_vfs_uri_exists (top_theme_dir_uri))
-     gnome_vfs_make_directory_for_uri (top_theme_dir_uri, 0775);
-   add_top_icon_theme_dir_monitor (top_theme_dir_uri, &real_monitor_not_added, 2, NULL);
diff --git a/sysutils/gnome-control-center/files/patch-configure b/sysutils/gnome-control-center/files/patch-configure
deleted file mode 100644
index 6527e6758..000000000
--- a/sysutils/gnome-control-center/files/patch-configure
+++ /dev/null
@@ -1,10 +0,0 @@
---- configure.orig	Tue Feb 13 07:51:47 2007
-+++ configure	Tue Feb 13 07:51:47 2007
-@@ -22302,6 +22302,7 @@
- if test "${gt_cv_func_ngettext_libc+set}" = set; then
-   echo $ECHO_N "(cached) $ECHO_C" >&6
- else
-+  LIBS="-lintl $LIBS"
-   cat >conftest.$ac_ext <<_ACEOF
- /* confdefs.h.  */
- _ACEOF
diff --git a/sysutils/gnome-control-center/files/patch-libslab_directory-tile.c b/sysutils/gnome-control-center/files/patch-libslab_directory-tile.c
deleted file mode 100644
index 86acdbe0c..000000000
--- a/sysutils/gnome-control-center/files/patch-libslab_directory-tile.c
+++ /dev/null
@@ -1,9 +0,0 @@
---- libslab/directory-tile.c.orig	Mon Mar 12 16:33:35 2007
-+++ libslab/directory-tile.c	Mon Mar 12 16:35:48 2007
-@@ -644,5 +644,5 @@ static void
- disown_spawned_child (gpointer user_data)
- {
- 	setsid  ();
--	setpgrp ();
-+	setpgrp (0, 0);
- }
diff --git a/sysutils/gnome-control-center/pkg-descr b/sysutils/gnome-control-center/pkg-descr
deleted file mode 100644
index 26d4dbe92..000000000
--- a/sysutils/gnome-control-center/pkg-descr
+++ /dev/null
@@ -1 +0,0 @@
-Configuration tools tightly integrated within the GNOME 2 desktop.
diff --git a/sysutils/gnome-control-center/pkg-plist b/sysutils/gnome-control-center/pkg-plist
deleted file mode 100644
index 94006da59..000000000
--- a/sysutils/gnome-control-center/pkg-plist
+++ /dev/null
@@ -1,320 +0,0 @@
-%%ABOUTME%%bin/gnome-about-me
-bin/gnome-appearance-properties
-bin/gnome-at-mobility
-bin/gnome-at-properties
-bin/gnome-at-visual
-bin/gnome-control-center
-bin/gnome-default-applications-properties
-bin/gnome-display-properties
-bin/gnome-font-viewer
-bin/gnome-keybinding-properties
-bin/gnome-keyboard-properties
-bin/gnome-mouse-properties
-bin/gnome-network-preferences
-bin/gnome-sound-properties
-bin/gnome-theme-thumbnailer
-bin/gnome-thumbnail-font
-bin/gnome-typing-monitor
-bin/gnome-window-properties
-bin/themus-theme-applier
-etc/gnome-vfs-2.0/modules/font-method.conf
-etc/gnome-vfs-2.0/modules/theme-method.conf
-etc/xdg/autostart/gnome-at-session.desktop
-etc/xdg/menus/gnomecc.menu
-include/gnome-window-settings-2.0/gnome-window-manager.h
-include/gnome-window-settings-2.0/gnome-wm-manager.h
-lib/gnome-vfs-2.0/modules/libfont-method.a
-lib/gnome-vfs-2.0/modules/libfont-method.la
-lib/gnome-vfs-2.0/modules/libfont-method.so
-lib/gnome-vfs-2.0/modules/libtheme-method.a
-lib/gnome-vfs-2.0/modules/libtheme-method.la
-lib/gnome-vfs-2.0/modules/libtheme-method.so
-lib/libgnome-window-settings.a
-lib/libgnome-window-settings.la
-lib/libgnome-window-settings.so
-lib/libgnome-window-settings.so.1
-lib/nautilus/extensions-2.0/libnautilus-fontilus.a
-lib/nautilus/extensions-2.0/libnautilus-fontilus.la
-lib/nautilus/extensions-2.0/libnautilus-fontilus.so
-lib/nautilus/extensions-2.0/libnautilus-themus.a
-lib/nautilus/extensions-2.0/libnautilus-themus.la
-lib/nautilus/extensions-2.0/libnautilus-themus.so
-lib/window-manager-settings/libmetacity.a
-lib/window-manager-settings/libmetacity.la
-lib/window-manager-settings/libmetacity.so
-libdata/pkgconfig/gnome-keybindings.pc
-libdata/pkgconfig/gnome-window-settings-2.0.pc
-share/applications/at-properties.desktop
-share/applications/default-applications.desktop
-share/applications/display-properties.desktop
-%%ABOUTME%%share/applications/gnome-about-me.desktop
-share/applications/gnome-appearance-properties.desktop
-share/applications/gnome-font-viewer.desktop
-share/applications/gnome-network-preferences.desktop
-share/applications/gnome-settings-mouse.desktop
-share/applications/gnome-settings-sound.desktop
-share/applications/gnome-theme-installer.desktop
-share/applications/gnomecc.desktop
-share/applications/keybinding.desktop
-share/applications/keyboard.desktop
-share/applications/themus-theme-applier.desktop
-share/applications/window-properties.desktop
-share/desktop-directories/font-method.directory
-share/desktop-directories/gnomecc.directory
-share/desktop-directories/theme-method.directory
-%%DATADIR%%/glade/appearance.glade
-%%DATADIR%%/glade/apply-font.glade
-%%DATADIR%%/glade/at-enable-dialog.glade
-%%ABOUTME%%%%DATADIR%%/glade/gnome-about-me.glade
-%%DATADIR%%/glade/gnome-default-applications-properties.glade
-%%DATADIR%%/glade/gnome-keybinding-properties.glade
-%%DATADIR%%/glade/gnome-keyboard-properties.glade
-%%DATADIR%%/glade/gnome-mouse-properties.glade
-%%DATADIR%%/glade/gnome-network-preferences.glade
-%%DATADIR%%/glade/gnome-window-properties.glade
-%%DATADIR%%/glade/sound-properties.glade
-%%DATADIR%%/gnome-default-applications.xml
-%%DATADIR%%/keybindings/00-multimedia-key.xml
-%%DATADIR%%/keybindings/01-desktop-key.xml
-%%DATADIR%%/pixmaps/at-startup.png
-%%DATADIR%%/pixmaps/at-support.png
-%%DATADIR%%/pixmaps/bar-disabled.png
-%%DATADIR%%/pixmaps/bar-green.png
-%%DATADIR%%/pixmaps/bar-red.png
-%%DATADIR%%/pixmaps/bar.png
-%%DATADIR%%/pixmaps/double-click-maybe.png
-%%DATADIR%%/pixmaps/double-click-off.png
-%%DATADIR%%/pixmaps/double-click-on.png
-%%ABOUTME%%%%DATADIR%%/pixmaps/gnome-about-me-lock-open.png
-%%ABOUTME%%%%DATADIR%%/pixmaps/gnome-about-me-lock.png
-%%DATADIR%%/pixmaps/gtk-theme-thumbnailing.png
-%%DATADIR%%/pixmaps/icon-theme-thumbnailing.png
-%%DATADIR%%/pixmaps/mouse-cursor-normal-large.png
-%%DATADIR%%/pixmaps/mouse-cursor-normal.png
-%%DATADIR%%/pixmaps/mouse-cursor-white-large.png
-%%DATADIR%%/pixmaps/mouse-cursor-white.png
-%%DATADIR%%/pixmaps/ocean-stripes.png
-%%DATADIR%%/pixmaps/stop.png
-%%DATADIR%%/pixmaps/subpixel-bgr.png
-%%DATADIR%%/pixmaps/subpixel-rgb.png
-%%DATADIR%%/pixmaps/subpixel-vbgr.png
-%%DATADIR%%/pixmaps/subpixel-vrgb.png
-%%DATADIR%%/pixmaps/theme-thumbnailing.png
-%%DATADIR%%/pixmaps/visual-bell.png
-%%DATADIR%%/pixmaps/window-theme-thumbnailing.png
-share/gnome/cursor-fonts/cursor-large-white.pcf
-share/gnome/cursor-fonts/cursor-large.pcf
-share/gnome/cursor-fonts/cursor-white.pcf
-share/gnome/help/control-center/C/config-accessibility-keyboard.xml
-share/gnome/help/control-center/C/config-background.xml
-share/gnome/help/control-center/C/config-behavior.xml
-share/gnome/help/control-center/C/config-cds.xml
-share/gnome/help/control-center/C/config-default-apps.xml
-share/gnome/help/control-center/C/config-file-type.xml
-share/gnome/help/control-center/C/config-hints.xml
-share/gnome/help/control-center/C/config-html.xml
-share/gnome/help/control-center/C/config-kbd.xml
-share/gnome/help/control-center/C/config-keybindings.xml
-share/gnome/help/control-center/C/config-mouse.xml
-share/gnome/help/control-center/C/config-screensaver.xml
-share/gnome/help/control-center/C/config-sound.xml
-share/gnome/help/control-center/C/config-themes.xml
-share/gnome/help/control-center/C/control-center.xml
-share/gnome/help/control-center/ca/control-center.xml
-share/gnome/help/control-center/en_GB/control-center.xml
-share/gnome/help/control-center/es/control-center.xml
-share/gnome/help/control-center/fr/control-center.xml
-share/gnome/help/control-center/it/control-center.xml
-share/gnome/help/control-center/ja/control-center.xml
-share/gnome/help/control-center/oc/control-center.xml
-share/gnome/help/control-center/pa/control-center.xml
-share/gnome/help/control-center/pl/control-center.xml
-share/gnome/help/control-center/pt/control-center.xml
-share/gnome/help/control-center/pt_BR/control-center.xml
-share/gnome/help/control-center/ru/control-center.xml
-share/gnome/help/control-center/sv/control-center.xml
-share/gnome/help/control-center/uk/control-center.xml
-share/gnome/help/control-center/vi/control-center.xml
-share/gnome/help/control-center/zh_CN/control-center.xml
-share/icons/hicolor/16x16/apps/gnome-display-properties.png
-share/icons/hicolor/16x16/apps/gnome-network-preferences.png
-share/icons/hicolor/16x16/apps/gnome-sound-properties.png
-share/icons/hicolor/22x22/apps/gnome-display-properties.png
-share/icons/hicolor/22x22/apps/gnome-network-preferences.png
-share/icons/hicolor/22x22/apps/gnome-sound-properties.png
-share/icons/hicolor/24x24/apps/gnome-display-properties.png
-share/icons/hicolor/24x24/apps/gnome-network-preferences.png
-share/icons/hicolor/24x24/apps/gnome-sound-properties.png
-share/icons/hicolor/32x32/apps/gnome-display-properties.png
-share/icons/hicolor/32x32/apps/gnome-network-preferences.png
-share/icons/hicolor/32x32/apps/gnome-sound-properties.png
-share/icons/hicolor/48x48/apps/gnome-network-preferences.png
-share/icons/hicolor/48x48/apps/gnome-sound-properties.png
-share/icons/hicolor/48x48/apps/typing-monitor.png
-share/icons/hicolor/scalable/apps/gnome-display-properties.svg
-share/icons/hicolor/scalable/apps/gnome-network-preferences.svg
-share/icons/hicolor/scalable/apps/gnome-sound-properties.svg
-share/icons/hicolor/scalable/apps/typing-monitor.svg
-share/locale/af/LC_MESSAGES/gnome-control-center-2.0.mo
-share/locale/am/LC_MESSAGES/gnome-control-center-2.0.mo
-share/locale/ar/LC_MESSAGES/gnome-control-center-2.0.mo
-share/locale/as/LC_MESSAGES/gnome-control-center-2.0.mo
-share/locale/az/LC_MESSAGES/gnome-control-center-2.0.mo
-share/locale/be/LC_MESSAGES/gnome-control-center-2.0.mo
-share/locale/be@latin/LC_MESSAGES/gnome-control-center-2.0.mo
-share/locale/bg/LC_MESSAGES/gnome-control-center-2.0.mo
-share/locale/bn/LC_MESSAGES/gnome-control-center-2.0.mo
-share/locale/bn_IN/LC_MESSAGES/gnome-control-center-2.0.mo
-share/locale/br/LC_MESSAGES/gnome-control-center-2.0.mo
-share/locale/bs/LC_MESSAGES/gnome-control-center-2.0.mo
-share/locale/ca/LC_MESSAGES/gnome-control-center-2.0.mo
-share/locale/cs/LC_MESSAGES/gnome-control-center-2.0.mo
-share/locale/cy/LC_MESSAGES/gnome-control-center-2.0.mo
-share/locale/da/LC_MESSAGES/gnome-control-center-2.0.mo
-share/locale/de/LC_MESSAGES/gnome-control-center-2.0.mo
-share/locale/dz/LC_MESSAGES/gnome-control-center-2.0.mo
-share/locale/el/LC_MESSAGES/gnome-control-center-2.0.mo
-share/locale/en_CA/LC_MESSAGES/gnome-control-center-2.0.mo
-share/locale/en_GB/LC_MESSAGES/gnome-control-center-2.0.mo
-share/locale/es/LC_MESSAGES/gnome-control-center-2.0.mo
-share/locale/et/LC_MESSAGES/gnome-control-center-2.0.mo
-share/locale/eu/LC_MESSAGES/gnome-control-center-2.0.mo
-share/locale/fa/LC_MESSAGES/gnome-control-center-2.0.mo
-share/locale/fi/LC_MESSAGES/gnome-control-center-2.0.mo
-share/locale/fr/LC_MESSAGES/gnome-control-center-2.0.mo
-share/locale/ga/LC_MESSAGES/gnome-control-center-2.0.mo
-share/locale/gl/LC_MESSAGES/gnome-control-center-2.0.mo
-share/locale/gu/LC_MESSAGES/gnome-control-center-2.0.mo
-share/locale/he/LC_MESSAGES/gnome-control-center-2.0.mo
-share/locale/hi/LC_MESSAGES/gnome-control-center-2.0.mo
-share/locale/hr/LC_MESSAGES/gnome-control-center-2.0.mo
-share/locale/hu/LC_MESSAGES/gnome-control-center-2.0.mo
-share/locale/id/LC_MESSAGES/gnome-control-center-2.0.mo
-share/locale/is/LC_MESSAGES/gnome-control-center-2.0.mo
-share/locale/it/LC_MESSAGES/gnome-control-center-2.0.mo
-share/locale/ja/LC_MESSAGES/gnome-control-center-2.0.mo
-share/locale/ka/LC_MESSAGES/gnome-control-center-2.0.mo
-share/locale/kn/LC_MESSAGES/gnome-control-center-2.0.mo
-share/locale/ko/LC_MESSAGES/gnome-control-center-2.0.mo
-share/locale/ku/LC_MESSAGES/gnome-control-center-2.0.mo
-share/locale/lt/LC_MESSAGES/gnome-control-center-2.0.mo
-share/locale/lv/LC_MESSAGES/gnome-control-center-2.0.mo
-share/locale/mg/LC_MESSAGES/gnome-control-center-2.0.mo
-share/locale/mk/LC_MESSAGES/gnome-control-center-2.0.mo
-share/locale/ml/LC_MESSAGES/gnome-control-center-2.0.mo
-share/locale/mn/LC_MESSAGES/gnome-control-center-2.0.mo
-share/locale/mr/LC_MESSAGES/gnome-control-center-2.0.mo
-share/locale/ms/LC_MESSAGES/gnome-control-center-2.0.mo
-share/locale/nb/LC_MESSAGES/gnome-control-center-2.0.mo
-share/locale/ne/LC_MESSAGES/gnome-control-center-2.0.mo
-share/locale/nl/LC_MESSAGES/gnome-control-center-2.0.mo
-share/locale/nn/LC_MESSAGES/gnome-control-center-2.0.mo
-share/locale/nso/LC_MESSAGES/gnome-control-center-2.0.mo
-share/locale/oc/LC_MESSAGES/gnome-control-center-2.0.mo
-share/locale/or/LC_MESSAGES/gnome-control-center-2.0.mo
-share/locale/pa/LC_MESSAGES/gnome-control-center-2.0.mo
-share/locale/pl/LC_MESSAGES/gnome-control-center-2.0.mo
-share/locale/pt/LC_MESSAGES/gnome-control-center-2.0.mo
-share/locale/pt_BR/LC_MESSAGES/gnome-control-center-2.0.mo
-share/locale/ro/LC_MESSAGES/gnome-control-center-2.0.mo
-share/locale/ru/LC_MESSAGES/gnome-control-center-2.0.mo
-share/locale/rw/LC_MESSAGES/gnome-control-center-2.0.mo
-share/locale/si/LC_MESSAGES/gnome-control-center-2.0.mo
-share/locale/sk/LC_MESSAGES/gnome-control-center-2.0.mo
-share/locale/sl/LC_MESSAGES/gnome-control-center-2.0.mo
-share/locale/sq/LC_MESSAGES/gnome-control-center-2.0.mo
-share/locale/sr/LC_MESSAGES/gnome-control-center-2.0.mo
-share/locale/sr@Latn/LC_MESSAGES/gnome-control-center-2.0.mo
-share/locale/sv/LC_MESSAGES/gnome-control-center-2.0.mo
-share/locale/ta/LC_MESSAGES/gnome-control-center-2.0.mo
-share/locale/te/LC_MESSAGES/gnome-control-center-2.0.mo
-share/locale/th/LC_MESSAGES/gnome-control-center-2.0.mo
-share/locale/tr/LC_MESSAGES/gnome-control-center-2.0.mo
-share/locale/uk/LC_MESSAGES/gnome-control-center-2.0.mo
-share/locale/vi/LC_MESSAGES/gnome-control-center-2.0.mo
-share/locale/wa/LC_MESSAGES/gnome-control-center-2.0.mo
-share/locale/xh/LC_MESSAGES/gnome-control-center-2.0.mo
-share/locale/zh_CN/LC_MESSAGES/gnome-control-center-2.0.mo
-share/locale/zh_HK/LC_MESSAGES/gnome-control-center-2.0.mo
-share/locale/zh_TW/LC_MESSAGES/gnome-control-center-2.0.mo
-share/locale/zu/LC_MESSAGES/gnome-control-center-2.0.mo
-share/mime/application/x-gnome-theme-package.xml
-share/mime/packages/gnome-theme-package.xml
-share/omf/control-center/control-center-C.omf
-share/omf/control-center/control-center-ca.omf
-share/omf/control-center/control-center-en_GB.omf
-share/omf/control-center/control-center-es.omf
-share/omf/control-center/control-center-fr.omf
-share/omf/control-center/control-center-it.omf
-share/omf/control-center/control-center-ja.omf
-share/omf/control-center/control-center-oc.omf
-share/omf/control-center/control-center-pa.omf
-share/omf/control-center/control-center-pl.omf
-share/omf/control-center/control-center-pt.omf
-share/omf/control-center/control-center-pt_BR.omf
-share/omf/control-center/control-center-ru.omf
-share/omf/control-center/control-center-sv.omf
-share/omf/control-center/control-center-uk.omf
-share/omf/control-center/control-center-vi.omf
-share/omf/control-center/control-center-zh_CN.omf
-@dirrm share/omf/control-center
-@dirrm share/gnome/help/control-center/zh_CN
-@dirrm share/gnome/help/control-center/vi
-@dirrm share/gnome/help/control-center/uk
-@dirrm share/gnome/help/control-center/sv
-@dirrm share/gnome/help/control-center/ru
-@dirrm share/gnome/help/control-center/pt_BR
-@dirrm share/gnome/help/control-center/pt
-@dirrm share/gnome/help/control-center/pl
-@dirrm share/gnome/help/control-center/pa
-@dirrm share/gnome/help/control-center/oc
-@dirrm share/gnome/help/control-center/ja
-@dirrm share/gnome/help/control-center/it
-@dirrm share/gnome/help/control-center/fr
-@dirrm share/gnome/help/control-center/es
-@dirrm share/gnome/help/control-center/en_GB
-@dirrm share/gnome/help/control-center/ca
-@dirrm share/gnome/help/control-center/C
-@dirrm share/gnome/help/control-center
-@dirrm share/gnome/cursor-fonts
-@dirrm %%DATADIR%%/pixmaps
-@dirrm %%DATADIR%%/glade
-@dirrmtry share/desktop-directories
-@dirrmtry share/applications
-@dirrm lib/window-manager-settings
-@dirrm include/gnome-window-settings-2.0
-@dirrmtry etc/xdg/autostart
-@exec %%LOCALBASE%%/bin/update-mime-database %D/share/mime
-@unexec %%LOCALBASE%%/bin/update-mime-database %D/share/mime
-@exec %%LOCALBASE%%/bin/update-desktop-database > /dev/null || /usr/bin/true
-@unexec %%LOCALBASE%%/bin/update-desktop-database > /dev/null || /usr/bin/true
-@dirrmtry share/locale/zu/LC_MESSAGES
-@dirrmtry share/locale/zu
-@dirrmtry share/locale/zh_HK/LC_MESSAGES
-@dirrmtry share/locale/zh_HK
-@dirrmtry share/locale/xh/LC_MESSAGES
-@dirrmtry share/locale/xh
-@dirrmtry share/locale/te/LC_MESSAGES
-@dirrmtry share/locale/te
-@dirrmtry share/locale/si/LC_MESSAGES
-@dirrmtry share/locale/si
-@dirrmtry share/locale/rw/LC_MESSAGES
-@dirrmtry share/locale/rw
-@dirrmtry share/locale/oc/LC_MESSAGES
-@dirrmtry share/locale/oc
-@dirrmtry share/locale/nso/LC_MESSAGES
-@dirrmtry share/locale/nso
-@dirrmtry share/locale/mr/LC_MESSAGES
-@dirrmtry share/locale/mr
-@dirrmtry share/locale/mg/LC_MESSAGES
-@dirrmtry share/locale/mg
-@dirrmtry share/locale/ku/LC_MESSAGES
-@dirrmtry share/locale/ku
-@dirrmtry share/locale/dz/LC_MESSAGES
-@dirrmtry share/locale/dz
-@dirrmtry share/locale/bn_IN/LC_MESSAGES
-@dirrmtry share/locale/bn_IN
-@dirrmtry share/locale/be@latin/LC_MESSAGES
-@dirrmtry share/locale/be@latin
-@dirrmtry share/locale/as/LC_MESSAGES
-@dirrmtry share/locale/as
diff --git a/sysutils/gnome-device-manager/Makefile b/sysutils/gnome-device-manager/Makefile
deleted file mode 100644
index 14c3f4405..000000000
--- a/sysutils/gnome-device-manager/Makefile
+++ /dev/null
@@ -1,29 +0,0 @@
-# New ports collection makefile for:   gnome-device-manager
-# Date Created:			08 January 2008
-# Whom:				Joe Marcus Clarke <marcus@FreeBSD.org>
-#
-# $FreeBSD$
-#   $MCom: ports/sysutils/hal/Makefile,v 1.26 2006/10/13 10:00:57 ahze Exp $
-#
-
-PORTNAME=	gnome-device-manager
-PORTVERSION=	0.2
-CATEGORIES=	sysutils
-MASTER_SITES=	http://hal.freedesktop.org/releases/
-
-MAINTAINER=	gnome@FreeBSD.org
-COMMENT=	HAL device manager for the GNOME Desktop
-
-LIB_DEPENDS=	hal.1:${PORTSDIR}/sysutils/hal
-
-USE_BZIP2=	yes
-USE_GMAKE=	yes
-USE_GNOME=	gnomehack gnometarget intlhack ltverhack libgnomeui
-USE_AUTOTOOLS=	libtool:15
-INSTALLS_ICONS=	yes
-USE_LDCONFIG=	yes
-INSTALLS_OMF=	yes
-CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" \
-		LDFLAGS="-L${LOCALBASE}/lib"
-
-.include <bsd.port.mk>
diff --git a/sysutils/gnome-device-manager/distinfo b/sysutils/gnome-device-manager/distinfo
deleted file mode 100644
index 631e741d3..000000000
--- a/sysutils/gnome-device-manager/distinfo
+++ /dev/null
@@ -1,3 +0,0 @@
-MD5 (gnome-device-manager-0.2.tar.bz2) = b833a90c940dd6cc992c42ad05ca6831
-SHA256 (gnome-device-manager-0.2.tar.bz2) = fecb3bf79c3f10bebf0601c044344b0105738c1533f5da62f27dc84d0a3b30d3
-SIZE (gnome-device-manager-0.2.tar.bz2) = 426804
diff --git a/sysutils/gnome-device-manager/pkg-descr b/sysutils/gnome-device-manager/pkg-descr
deleted file mode 100644
index f6664a36d..000000000
--- a/sysutils/gnome-device-manager/pkg-descr
+++ /dev/null
@@ -1,6 +0,0 @@
-This is a GNOME program to manage devices and device drivers. It's
-inspired by hal-device-manager, from the HAL project, but rewritten in
-C for efficiency and an outlook to actually make it manage devices
-rather than just show information.
-
-WWW: http://www.freedesktop.org/Software/hal
diff --git a/sysutils/gnome-device-manager/pkg-plist b/sysutils/gnome-device-manager/pkg-plist
deleted file mode 100644
index c06d8f88a..000000000
--- a/sysutils/gnome-device-manager/pkg-plist
+++ /dev/null
@@ -1,24 +0,0 @@
-bin/gnome-device-manager
-include/gnome-device-manager/gdm-device.h
-include/gnome-device-manager/gdm-info-provider-iface.h
-include/gnome-device-manager/gdm-info-provider.h
-include/gnome-device-manager/gdm-pool.h
-lib/libgnome-device-manager.a
-lib/libgnome-device-manager.la
-lib/libgnome-device-manager.so
-lib/libgnome-device-manager.so.0
-libdata/pkgconfig/gnome-device-manager.pc
-share/applications/gnome-device-manager.desktop
-share/gnome/help/gnome-device-manager/C/figures/gnome-device-manager.png
-share/gnome/help/gnome-device-manager/C/gnome-device-manager.xml
-share/gnome/help/gnome-device-manager/C/legal.xml
-share/icons/hicolor/48x48/apps/gnome-device-manager-device-pci.png
-share/icons/hicolor/48x48/apps/gnome-device-manager-device-usb-interface.png
-share/icons/hicolor/48x48/apps/gnome-device-manager-device-usb.png
-share/icons/hicolor/48x48/apps/gnome-device-manager.png
-share/omf/gnome-device-manager/gnome-device-manager-C.omf
-@dirrm share/omf/gnome-device-manager
-@dirrm share/gnome/help/gnome-device-manager/C/figures
-@dirrm share/gnome/help/gnome-device-manager/C
-@dirrm share/gnome/help/gnome-device-manager
-@dirrm include/gnome-device-manager
diff --git a/sysutils/gnome-mount/Makefile b/sysutils/gnome-mount/Makefile
deleted file mode 100644
index 187cd51a6..000000000
--- a/sysutils/gnome-mount/Makefile
+++ /dev/null
@@ -1,37 +0,0 @@
-# New ports collection makefile for:	gnome-mount
-# Date created:			04 June 2006
-# Whom:				Joe Marcus Clarke <marcus@FreeBSD.org>
-#
-# $FreeBSD$
-#   $MCom: ports/sysutils/gnome-mount/Makefile,v 1.23 2008/01/20 18:41:43 marcus Exp $
-#
-
-PORTNAME=	gnome-mount
-PORTVERSION=	0.7
-PORTREVISION=	5
-CATEGORIES=	sysutils gnome
-MASTER_SITES=	http://hal.freedesktop.org/releases/
-
-MAINTAINER=	gnome@FreeBSD.org
-COMMENT=	A front-end to mount, umount, and eject using HAL
-
-LIB_DEPENDS=	hal.1:${PORTSDIR}/sysutils/hal \
-		notify.1:${PORTSDIR}/devel/libnotify \
-		gnome-keyring:${PORTSDIR}/security/gnome-keyring
-RUN_DEPENDS=	${LOCALBASE}/libdata/pkgconfig/polkit-gnome.pc:${PORTSDIR}/sysutils/policykit-gnome
-
-USE_XLIB=	yes
-USE_GNOME=	gnomeprefix gnomehack intlhack gconf2 gtk20
-USE_GMAKE=	yes
-USE_GETTEXT=	yes
-GNU_CONFIGURE=	yes
-CONFIGURE_ARGS=	--disable-nautilus-extension
-CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" \
-		LDFLAGS="-L${LOCALBASE}/lib"
-
-GCONF_SCHEMAS=	gnome-mount.schemas
-MAN1=		gnome-mount.1
-MLINKS=		gnome-mount.1 gnome-eject.1 \
-		gnome-mount.1 gnome-umount.1
-
-.include <bsd.port.mk>
diff --git a/sysutils/gnome-mount/distinfo b/sysutils/gnome-mount/distinfo
deleted file mode 100644
index 648224657..000000000
--- a/sysutils/gnome-mount/distinfo
+++ /dev/null
@@ -1,3 +0,0 @@
-MD5 (gnome-mount-0.7.tar.gz) = 6a2f14925376c2c494df89cbfbdb2ca5
-SHA256 (gnome-mount-0.7.tar.gz) = 009c8a920e40f414936bf2ad3a883e1c3fdcf0af8f736c8e840167406f737608
-SIZE (gnome-mount-0.7.tar.gz) = 484021
diff --git a/sysutils/gnome-mount/files/patch-gnome-mount.schemas.in b/sysutils/gnome-mount/files/patch-gnome-mount.schemas.in
deleted file mode 100644
index c46bf1609..000000000
--- a/sysutils/gnome-mount/files/patch-gnome-mount.schemas.in
+++ /dev/null
@@ -1,47 +0,0 @@
---- gnome-mount.schemas.in.orig	Tue Apr 10 18:50:12 2007
-+++ gnome-mount.schemas.in	Sat Apr 14 14:49:22 2007
-@@ -6,7 +6,7 @@
-         <applyto>/system/storage/default_options/vfat/mount_options</applyto>
-         <type>list</type>
-         <list_type>string</list_type>
--        <default>[shortname=lower,uid=]</default>
-+        <default>[longnames,-u=]</default>
-         <locale name="C">
-           <short>Default mount options for vfat fs</short>
-           <long>A list of default mount options for volumes formatted with the vfat file system.</long>
-@@ -18,7 +18,7 @@
-         <applyto>/system/storage/default_options/iso9660/mount_options</applyto>
-         <type>list</type>
-         <list_type>string</list_type>
--        <default>[uid=]</default>
-+        <default>[]</default>
-         <locale name="C">
-           <short>Default mount options for iso9660 fs</short>
-           <long>A list of default mount options for volumes formatted with the iso9660 file system.</long>
-@@ -30,7 +30,7 @@
-         <applyto>/system/storage/default_options/udf/mount_options</applyto>
-         <type>list</type>
-         <list_type>string</list_type>
--        <default>[uid=]</default>
-+        <default>[]</default>
-         <locale name="C">
-           <short>Default mount options for udf fs</short>
-           <long>A list of default mount options for volumes formatted with the udf file system.</long>
-@@ -42,7 +42,7 @@
-         <applyto>/system/storage/default_options/ntfs/mount_options</applyto>
-         <type>list</type>
-         <list_type>string</list_type>
--        <default>[umask=222]</default>
-+        <default>[-m=755]</default>
-         <locale name="C">
-           <short>Default mount options for ntfs fs</short>
-           <long>A list of default mount options for volumes formatted with the ntfs file system.</long>
-@@ -52,7 +52,7 @@
-         <key>/schemas/system/storage/default_options/ntfs/fstype_override</key>
-         <applyto>/system/storage/default_options/ntfs/fstype_override</applyto>
-         <type>string</type>
--        <default>ntfs-3g</default>
-+        <default></default>
-         <locale name="C">
-           <short>When 'ntfs' is detected, what file system driver to use by default</short>
-           <long>The name of the file system driver to use by default when 'ntfs' is detected. This is useful for configuring the system to use the 'ntfs-3g' driver for all 'ntfs' file systems by default. User can still choose to use the 'ntfs' file system driver by overriding it per-volume or on the command line.</long>
diff --git a/sysutils/gnome-mount/files/patch-src_gnome-mount.c b/sysutils/gnome-mount/files/patch-src_gnome-mount.c
deleted file mode 100644
index 0d4136e5c..000000000
--- a/sysutils/gnome-mount/files/patch-src_gnome-mount.c
+++ /dev/null
@@ -1,20 +0,0 @@
---- src/gnome-mount.c.orig	Sun Sep 17 01:17:54 2006
-+++ src/gnome-mount.c	Sun Feb 11 01:03:16 2007
-@@ -380,7 +385,7 @@ show_error_dialog_mount (LibHalVolume *v
- 		} else if (strcmp (error_name, "org.freedesktop.Hal.Device.Volume.AlreadyMounted") == 0) {
- 
- 			/* don't show any dialog for this */
--			gtk_widget_unref (w);
-+			gtk_widget_destroy (w);
- 			w = NULL;
- 
- #if 0
-@@ -399,7 +404,7 @@ show_error_dialog_mount (LibHalVolume *v
- 			 *
- 			 * Don't show any dialog for this.
- 			 */
--			gtk_widget_unref (w);
-+			gtk_widget_destroy (w);
- 			w = NULL;
- 			 
- 		} else {
diff --git a/sysutils/gnome-mount/pkg-descr b/sysutils/gnome-mount/pkg-descr
deleted file mode 100644
index a75d36294..000000000
--- a/sysutils/gnome-mount/pkg-descr
+++ /dev/null
@@ -1,2 +0,0 @@
-gnome-mount is a HAL-based front-end to mount, umount, and eject which
-offers a centralized place where settings for these commands are maintained.
diff --git a/sysutils/gnome-mount/pkg-plist b/sysutils/gnome-mount/pkg-plist
deleted file mode 100644
index d35d0b048..000000000
--- a/sysutils/gnome-mount/pkg-plist
+++ /dev/null
@@ -1,34 +0,0 @@
-bin/gnome-eject
-bin/gnome-mount
-bin/gnome-umount
-libdata/pkgconfig/gnome-mount.pc
-share/gnome-mount/gnome-mount-properties.glade
-share/locale/ar/LC_MESSAGES/gnome-mount.mo
-share/locale/be/LC_MESSAGES/gnome-mount.mo
-share/locale/be@latin/LC_MESSAGES/gnome-mount.mo
-share/locale/ca/LC_MESSAGES/gnome-mount.mo
-share/locale/da/LC_MESSAGES/gnome-mount.mo
-share/locale/dz/LC_MESSAGES/gnome-mount.mo
-share/locale/en_GB/LC_MESSAGES/gnome-mount.mo
-share/locale/es/LC_MESSAGES/gnome-mount.mo
-share/locale/fi/LC_MESSAGES/gnome-mount.mo
-share/locale/fr/LC_MESSAGES/gnome-mount.mo
-share/locale/hu/LC_MESSAGES/gnome-mount.mo
-share/locale/it/LC_MESSAGES/gnome-mount.mo
-share/locale/ja/LC_MESSAGES/gnome-mount.mo
-share/locale/lv/LC_MESSAGES/gnome-mount.mo
-share/locale/mk/LC_MESSAGES/gnome-mount.mo
-share/locale/nb/LC_MESSAGES/gnome-mount.mo
-share/locale/oc/LC_MESSAGES/gnome-mount.mo
-share/locale/pl/LC_MESSAGES/gnome-mount.mo
-share/locale/pt_BR/LC_MESSAGES/gnome-mount.mo
-share/locale/ru/LC_MESSAGES/gnome-mount.mo
-share/locale/sv/LC_MESSAGES/gnome-mount.mo
-share/locale/vi/LC_MESSAGES/gnome-mount.mo
-@dirrm share/gnome-mount
-@dirrmtry share/locale/oc/LC_MESSAGES
-@dirrmtry share/locale/oc
-@dirrmtry share/locale/dz/LC_MESSAGES
-@dirrmtry share/locale/dz
-@dirrmtry share/locale/be@latin/LC_MESSAGES
-@dirrmtry share/locale/be@latin
diff --git a/sysutils/gnome-power-manager/Makefile b/sysutils/gnome-power-manager/Makefile
deleted file mode 100644
index d50477cfa..000000000
--- a/sysutils/gnome-power-manager/Makefile
+++ /dev/null
@@ -1,49 +0,0 @@
-# New ports collection makefile for:	gnome-power-manager
-# Date created:				03 May 2006
-# Whom:					Joe Marcus Clarke <marcus@FreeBSD.org>
-#
-# $FreeBSD$
-#   $MCom: ports/sysutils/gnome-power-manager/Makefile,v 1.39 2008/02/14 21:28:28 kwm Exp $
-#
-
-PORTNAME=	gnome-power-manager
-PORTVERSION=	2.22.0
-CATEGORIES=	sysutils gnome
-MASTER_SITES=	${MASTER_SITE_GNOME}
-MASTER_SITE_SUBDIR=	sources/${PORTNAME}/${PORTVERSION:C/^([0-9]+\.[0-9]+).*/\1/}
-DIST_SUBDIR=	gnome2
-
-MAINTAINER=	gnome@FreeBSD.org
-COMMENT=	Power management system for the GNOME Desktop
-
-BUILD_DEPENDS=	docbook2html:${PORTSDIR}/textproc/docbook-utils \
-    		${LOCALBASE}/share/sgml/docbook/4.1/catalog:${PORTSDIR}/textproc/docbook-410
-LIB_DEPENDS=	hal.1:${PORTSDIR}/sysutils/hal \
-		notify.1:${PORTSDIR}/devel/libnotify
-
-USE_GETTEXT=	yes
-USE_BZIP2=	yes
-USE_XLIB=	yes
-USE_GMAKE=	yes
-INSTALLS_OMF=	yes
-INSTALLS_ICONS=	yes
-USE_AUTOTOOLS=	libtool:15
-USE_GSTREAMER=	good
-USE_GNOME=	gnomeprefix gnomehack intlhack libgnomeui libwnck \
-		gnomedocutils gnomepanel
-CONFIGURE_ARGS=	--disable-icon-framing \
-		--with-doc-dir=${PREFIX}/share/doc \
-		--disable-docbook-docs
-CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" \
-		LDFLAGS="-L${LOCALBASE}/lib"
-
-GCONF_SCHEMAS=	gnome-power-manager.schemas
-
-MAN1=		gnome-power-manager.1 gnome-power-preferences.1 \
-		gnome-power-statistics.1
-
-post-patch:
-	@${REINPLACE_CMD} -e 's|-lresolv|| ; s|-Werror||g' \
-		${WRKSRC}/configure
-
-.include <bsd.port.mk>
diff --git a/sysutils/gnome-power-manager/distinfo b/sysutils/gnome-power-manager/distinfo
deleted file mode 100644
index 8a732edc9..000000000
--- a/sysutils/gnome-power-manager/distinfo
+++ /dev/null
@@ -1,3 +0,0 @@
-MD5 (gnome2/gnome-power-manager-2.22.0.tar.bz2) = 43c76a13a803a5c034f310bb20f91ff4
-SHA256 (gnome2/gnome-power-manager-2.22.0.tar.bz2) = a28500e52844286ef85f7fc773151be62c9cf6ce10ad51eceec99aa57304e70b
-SIZE (gnome2/gnome-power-manager-2.22.0.tar.bz2) = 2999358
diff --git a/sysutils/gnome-power-manager/pkg-descr b/sysutils/gnome-power-manager/pkg-descr
deleted file mode 100644
index 5b789d06c..000000000
--- a/sysutils/gnome-power-manager/pkg-descr
+++ /dev/null
@@ -1,7 +0,0 @@
-GNOME Power Manager is a GNOME session daemon that acts as a policy agent
-on top of HAL (the Hardware Abstraction Layer).  GNOME Power Manager listens
-for HAL events and responds with user-configurable reactions.
-Currently it supports laptop batteries and AC adapters. Its goal is to be
-architecture neutral and free of polling and other hacks.
-
-WWW: http://www.gnome.org/projects/gnome-power-manager/
diff --git a/sysutils/gnome-power-manager/pkg-plist b/sysutils/gnome-power-manager/pkg-plist
deleted file mode 100644
index 6e72d046a..000000000
--- a/sysutils/gnome-power-manager/pkg-plist
+++ /dev/null
@@ -1,576 +0,0 @@
-bin/gnome-power-bugreport.sh
-bin/gnome-power-cmd.sh
-bin/gnome-power-manager
-bin/gnome-power-preferences
-bin/gnome-power-statistics
-libdata/bonobo/servers/GNOME_BrightnessApplet.server
-libdata/bonobo/servers/GNOME_InhibitApplet.server
-libexec/gnome-brightness-applet
-libexec/gnome-inhibit-applet
-share/applications/gnome-power-preferences.desktop
-share/applications/gnome-power-statistics.desktop
-share/dbus-1/services/gnome-power-manager.service
-share/gnome-2.0/ui/GNOME_BrightnessApplet.xml
-share/gnome-2.0/ui/GNOME_InhibitApplet.xml
-%%DATADIR%%/gpm-critical-power.wav
-%%DATADIR%%/gpm-feedback-widget.glade
-%%DATADIR%%/gpm-graph.glade
-%%DATADIR%%/gpm-inhibit-test.glade
-%%DATADIR%%/gpm-lid-down.wav
-%%DATADIR%%/gpm-lid-up.wav
-%%DATADIR%%/gpm-prefs.glade
-%%DATADIR%%/gpm-suspend-failure.wav
-%%DATADIR%%/gpm-unplugged.wav
-%%DATADIR%%/icons/hicolor/16x16/actions/gpm-hibernate.png
-%%DATADIR%%/icons/hicolor/16x16/actions/gpm-suspend.png
-%%DATADIR%%/icons/hicolor/16x16/status/gpm-ac-adapter.png
-%%DATADIR%%/icons/hicolor/16x16/status/gpm-brightness-kbd-disabled.png
-%%DATADIR%%/icons/hicolor/16x16/status/gpm-brightness-kbd-invalid.png
-%%DATADIR%%/icons/hicolor/16x16/status/gpm-brightness-kbd.png
-%%DATADIR%%/icons/hicolor/16x16/status/gpm-brightness-lcd-disabled.png
-%%DATADIR%%/icons/hicolor/16x16/status/gpm-brightness-lcd-invalid.png
-%%DATADIR%%/icons/hicolor/16x16/status/gpm-brightness-lcd.png
-%%DATADIR%%/icons/hicolor/16x16/status/gpm-inhibit-invalid.png
-%%DATADIR%%/icons/hicolor/16x16/status/gpm-inhibit.png
-%%DATADIR%%/icons/hicolor/16x16/status/gpm-keyboard-000.png
-%%DATADIR%%/icons/hicolor/16x16/status/gpm-keyboard-030.png
-%%DATADIR%%/icons/hicolor/16x16/status/gpm-keyboard-060.png
-%%DATADIR%%/icons/hicolor/16x16/status/gpm-keyboard-100.png
-%%DATADIR%%/icons/hicolor/16x16/status/gpm-mouse-000.png
-%%DATADIR%%/icons/hicolor/16x16/status/gpm-mouse-030.png
-%%DATADIR%%/icons/hicolor/16x16/status/gpm-mouse-060.png
-%%DATADIR%%/icons/hicolor/16x16/status/gpm-mouse-100.png
-%%DATADIR%%/icons/hicolor/16x16/status/gpm-phone-000.png
-%%DATADIR%%/icons/hicolor/16x16/status/gpm-phone-030.png
-%%DATADIR%%/icons/hicolor/16x16/status/gpm-phone-060.png
-%%DATADIR%%/icons/hicolor/16x16/status/gpm-phone-100.png
-%%DATADIR%%/icons/hicolor/16x16/status/gpm-primary-000-charging.png
-%%DATADIR%%/icons/hicolor/16x16/status/gpm-primary-000.png
-%%DATADIR%%/icons/hicolor/16x16/status/gpm-primary-020-charging.png
-%%DATADIR%%/icons/hicolor/16x16/status/gpm-primary-020.png
-%%DATADIR%%/icons/hicolor/16x16/status/gpm-primary-040-charging.png
-%%DATADIR%%/icons/hicolor/16x16/status/gpm-primary-040.png
-%%DATADIR%%/icons/hicolor/16x16/status/gpm-primary-060-charging.png
-%%DATADIR%%/icons/hicolor/16x16/status/gpm-primary-060.png
-%%DATADIR%%/icons/hicolor/16x16/status/gpm-primary-080-charging.png
-%%DATADIR%%/icons/hicolor/16x16/status/gpm-primary-080.png
-%%DATADIR%%/icons/hicolor/16x16/status/gpm-primary-100-charging.png
-%%DATADIR%%/icons/hicolor/16x16/status/gpm-primary-100.png
-%%DATADIR%%/icons/hicolor/16x16/status/gpm-primary-charged.png
-%%DATADIR%%/icons/hicolor/16x16/status/gpm-primary-missing.png
-%%DATADIR%%/icons/hicolor/16x16/status/gpm-ups-000-charging.png
-%%DATADIR%%/icons/hicolor/16x16/status/gpm-ups-000.png
-%%DATADIR%%/icons/hicolor/16x16/status/gpm-ups-020-charging.png
-%%DATADIR%%/icons/hicolor/16x16/status/gpm-ups-020.png
-%%DATADIR%%/icons/hicolor/16x16/status/gpm-ups-040-charging.png
-%%DATADIR%%/icons/hicolor/16x16/status/gpm-ups-040.png
-%%DATADIR%%/icons/hicolor/16x16/status/gpm-ups-060-charging.png
-%%DATADIR%%/icons/hicolor/16x16/status/gpm-ups-060.png
-%%DATADIR%%/icons/hicolor/16x16/status/gpm-ups-080-charging.png
-%%DATADIR%%/icons/hicolor/16x16/status/gpm-ups-080.png
-%%DATADIR%%/icons/hicolor/16x16/status/gpm-ups-100-charging.png
-%%DATADIR%%/icons/hicolor/16x16/status/gpm-ups-100.png
-%%DATADIR%%/icons/hicolor/16x16/status/gpm-ups-charged.png
-%%DATADIR%%/icons/hicolor/16x16/status/gpm-ups-missing.png
-%%DATADIR%%/icons/hicolor/22x22/actions/gpm-hibernate.png
-%%DATADIR%%/icons/hicolor/22x22/actions/gpm-suspend.png
-%%DATADIR%%/icons/hicolor/22x22/status/gpm-ac-adapter.png
-%%DATADIR%%/icons/hicolor/22x22/status/gpm-brightness-kbd-disabled.png
-%%DATADIR%%/icons/hicolor/22x22/status/gpm-brightness-kbd-invalid.png
-%%DATADIR%%/icons/hicolor/22x22/status/gpm-brightness-kbd.png
-%%DATADIR%%/icons/hicolor/22x22/status/gpm-brightness-lcd-disabled.png
-%%DATADIR%%/icons/hicolor/22x22/status/gpm-brightness-lcd-invalid.png
-%%DATADIR%%/icons/hicolor/22x22/status/gpm-brightness-lcd.png
-%%DATADIR%%/icons/hicolor/22x22/status/gpm-inhibit-invalid.png
-%%DATADIR%%/icons/hicolor/22x22/status/gpm-inhibit.png
-%%DATADIR%%/icons/hicolor/22x22/status/gpm-keyboard-000.png
-%%DATADIR%%/icons/hicolor/22x22/status/gpm-keyboard-030.png
-%%DATADIR%%/icons/hicolor/22x22/status/gpm-keyboard-060.png
-%%DATADIR%%/icons/hicolor/22x22/status/gpm-keyboard-100.png
-%%DATADIR%%/icons/hicolor/22x22/status/gpm-mouse-000.png
-%%DATADIR%%/icons/hicolor/22x22/status/gpm-mouse-030.png
-%%DATADIR%%/icons/hicolor/22x22/status/gpm-mouse-060.png
-%%DATADIR%%/icons/hicolor/22x22/status/gpm-mouse-100.png
-%%DATADIR%%/icons/hicolor/22x22/status/gpm-phone-000.png
-%%DATADIR%%/icons/hicolor/22x22/status/gpm-phone-030.png
-%%DATADIR%%/icons/hicolor/22x22/status/gpm-phone-060.png
-%%DATADIR%%/icons/hicolor/22x22/status/gpm-phone-100.png
-%%DATADIR%%/icons/hicolor/22x22/status/gpm-primary-000-charging.png
-%%DATADIR%%/icons/hicolor/22x22/status/gpm-primary-000.png
-%%DATADIR%%/icons/hicolor/22x22/status/gpm-primary-020-charging.png
-%%DATADIR%%/icons/hicolor/22x22/status/gpm-primary-020.png
-%%DATADIR%%/icons/hicolor/22x22/status/gpm-primary-040-charging.png
-%%DATADIR%%/icons/hicolor/22x22/status/gpm-primary-040.png
-%%DATADIR%%/icons/hicolor/22x22/status/gpm-primary-060-charging.png
-%%DATADIR%%/icons/hicolor/22x22/status/gpm-primary-060.png
-%%DATADIR%%/icons/hicolor/22x22/status/gpm-primary-080-charging.png
-%%DATADIR%%/icons/hicolor/22x22/status/gpm-primary-080.png
-%%DATADIR%%/icons/hicolor/22x22/status/gpm-primary-100-charging.png
-%%DATADIR%%/icons/hicolor/22x22/status/gpm-primary-100.png
-%%DATADIR%%/icons/hicolor/22x22/status/gpm-primary-charged.png
-%%DATADIR%%/icons/hicolor/22x22/status/gpm-primary-missing.png
-%%DATADIR%%/icons/hicolor/22x22/status/gpm-ups-000-charging.png
-%%DATADIR%%/icons/hicolor/22x22/status/gpm-ups-000.png
-%%DATADIR%%/icons/hicolor/22x22/status/gpm-ups-020-charging.png
-%%DATADIR%%/icons/hicolor/22x22/status/gpm-ups-020.png
-%%DATADIR%%/icons/hicolor/22x22/status/gpm-ups-040-charging.png
-%%DATADIR%%/icons/hicolor/22x22/status/gpm-ups-040.png
-%%DATADIR%%/icons/hicolor/22x22/status/gpm-ups-060-charging.png
-%%DATADIR%%/icons/hicolor/22x22/status/gpm-ups-060.png
-%%DATADIR%%/icons/hicolor/22x22/status/gpm-ups-080-charging.png
-%%DATADIR%%/icons/hicolor/22x22/status/gpm-ups-080.png
-%%DATADIR%%/icons/hicolor/22x22/status/gpm-ups-100-charging.png
-%%DATADIR%%/icons/hicolor/22x22/status/gpm-ups-100.png
-%%DATADIR%%/icons/hicolor/22x22/status/gpm-ups-charged.png
-%%DATADIR%%/icons/hicolor/22x22/status/gpm-ups-missing.png
-%%DATADIR%%/icons/hicolor/24x24/actions/gpm-hibernate.png
-%%DATADIR%%/icons/hicolor/24x24/actions/gpm-suspend.png
-%%DATADIR%%/icons/hicolor/24x24/status/gpm-ac-adapter.png
-%%DATADIR%%/icons/hicolor/24x24/status/gpm-brightness-kbd-disabled.png
-%%DATADIR%%/icons/hicolor/24x24/status/gpm-brightness-kbd-invalid.png
-%%DATADIR%%/icons/hicolor/24x24/status/gpm-brightness-kbd.png
-%%DATADIR%%/icons/hicolor/24x24/status/gpm-brightness-lcd-disabled.png
-%%DATADIR%%/icons/hicolor/24x24/status/gpm-brightness-lcd-invalid.png
-%%DATADIR%%/icons/hicolor/24x24/status/gpm-brightness-lcd.png
-%%DATADIR%%/icons/hicolor/24x24/status/gpm-inhibit-invalid.png
-%%DATADIR%%/icons/hicolor/24x24/status/gpm-inhibit.png
-%%DATADIR%%/icons/hicolor/24x24/status/gpm-keyboard-000.png
-%%DATADIR%%/icons/hicolor/24x24/status/gpm-keyboard-030.png
-%%DATADIR%%/icons/hicolor/24x24/status/gpm-keyboard-060.png
-%%DATADIR%%/icons/hicolor/24x24/status/gpm-keyboard-100.png
-%%DATADIR%%/icons/hicolor/24x24/status/gpm-mouse-000.png
-%%DATADIR%%/icons/hicolor/24x24/status/gpm-mouse-030.png
-%%DATADIR%%/icons/hicolor/24x24/status/gpm-mouse-060.png
-%%DATADIR%%/icons/hicolor/24x24/status/gpm-mouse-100.png
-%%DATADIR%%/icons/hicolor/24x24/status/gpm-phone-000.png
-%%DATADIR%%/icons/hicolor/24x24/status/gpm-phone-030.png
-%%DATADIR%%/icons/hicolor/24x24/status/gpm-phone-060.png
-%%DATADIR%%/icons/hicolor/24x24/status/gpm-phone-100.png
-%%DATADIR%%/icons/hicolor/24x24/status/gpm-primary-000-charging.png
-%%DATADIR%%/icons/hicolor/24x24/status/gpm-primary-000.png
-%%DATADIR%%/icons/hicolor/24x24/status/gpm-primary-020-charging.png
-%%DATADIR%%/icons/hicolor/24x24/status/gpm-primary-020.png
-%%DATADIR%%/icons/hicolor/24x24/status/gpm-primary-040-charging.png
-%%DATADIR%%/icons/hicolor/24x24/status/gpm-primary-040.png
-%%DATADIR%%/icons/hicolor/24x24/status/gpm-primary-060-charging.png
-%%DATADIR%%/icons/hicolor/24x24/status/gpm-primary-060.png
-%%DATADIR%%/icons/hicolor/24x24/status/gpm-primary-080-charging.png
-%%DATADIR%%/icons/hicolor/24x24/status/gpm-primary-080.png
-%%DATADIR%%/icons/hicolor/24x24/status/gpm-primary-100-charging.png
-%%DATADIR%%/icons/hicolor/24x24/status/gpm-primary-100.png
-%%DATADIR%%/icons/hicolor/24x24/status/gpm-primary-charged.png
-%%DATADIR%%/icons/hicolor/24x24/status/gpm-primary-missing.png
-%%DATADIR%%/icons/hicolor/24x24/status/gpm-ups-000-charging.png
-%%DATADIR%%/icons/hicolor/24x24/status/gpm-ups-000.png
-%%DATADIR%%/icons/hicolor/24x24/status/gpm-ups-020-charging.png
-%%DATADIR%%/icons/hicolor/24x24/status/gpm-ups-020.png
-%%DATADIR%%/icons/hicolor/24x24/status/gpm-ups-040-charging.png
-%%DATADIR%%/icons/hicolor/24x24/status/gpm-ups-040.png
-%%DATADIR%%/icons/hicolor/24x24/status/gpm-ups-060-charging.png
-%%DATADIR%%/icons/hicolor/24x24/status/gpm-ups-060.png
-%%DATADIR%%/icons/hicolor/24x24/status/gpm-ups-080-charging.png
-%%DATADIR%%/icons/hicolor/24x24/status/gpm-ups-080.png
-%%DATADIR%%/icons/hicolor/24x24/status/gpm-ups-100-charging.png
-%%DATADIR%%/icons/hicolor/24x24/status/gpm-ups-100.png
-%%DATADIR%%/icons/hicolor/24x24/status/gpm-ups-charged.png
-%%DATADIR%%/icons/hicolor/24x24/status/gpm-ups-missing.png
-%%DATADIR%%/icons/hicolor/48x48/actions/gpm-hibernate.png
-%%DATADIR%%/icons/hicolor/48x48/actions/gpm-suspend.png
-%%DATADIR%%/icons/hicolor/48x48/status/gpm-ac-adapter.png
-%%DATADIR%%/icons/hicolor/48x48/status/gpm-brightness-kbd-disabled.png
-%%DATADIR%%/icons/hicolor/48x48/status/gpm-brightness-kbd-invalid.png
-%%DATADIR%%/icons/hicolor/48x48/status/gpm-brightness-kbd.png
-%%DATADIR%%/icons/hicolor/48x48/status/gpm-brightness-lcd-disabled.png
-%%DATADIR%%/icons/hicolor/48x48/status/gpm-brightness-lcd-invalid.png
-%%DATADIR%%/icons/hicolor/48x48/status/gpm-brightness-lcd.png
-%%DATADIR%%/icons/hicolor/48x48/status/gpm-inhibit-invalid.png
-%%DATADIR%%/icons/hicolor/48x48/status/gpm-inhibit.png
-%%DATADIR%%/icons/hicolor/48x48/status/gpm-keyboard-000.png
-%%DATADIR%%/icons/hicolor/48x48/status/gpm-keyboard-030.png
-%%DATADIR%%/icons/hicolor/48x48/status/gpm-keyboard-060.png
-%%DATADIR%%/icons/hicolor/48x48/status/gpm-keyboard-100.png
-%%DATADIR%%/icons/hicolor/48x48/status/gpm-mouse-000.png
-%%DATADIR%%/icons/hicolor/48x48/status/gpm-mouse-030.png
-%%DATADIR%%/icons/hicolor/48x48/status/gpm-mouse-060.png
-%%DATADIR%%/icons/hicolor/48x48/status/gpm-mouse-100.png
-%%DATADIR%%/icons/hicolor/48x48/status/gpm-phone-000.png
-%%DATADIR%%/icons/hicolor/48x48/status/gpm-phone-030.png
-%%DATADIR%%/icons/hicolor/48x48/status/gpm-phone-060.png
-%%DATADIR%%/icons/hicolor/48x48/status/gpm-phone-100.png
-%%DATADIR%%/icons/hicolor/48x48/status/gpm-primary-000-charging.png
-%%DATADIR%%/icons/hicolor/48x48/status/gpm-primary-000.png
-%%DATADIR%%/icons/hicolor/48x48/status/gpm-primary-020-charging.png
-%%DATADIR%%/icons/hicolor/48x48/status/gpm-primary-020.png
-%%DATADIR%%/icons/hicolor/48x48/status/gpm-primary-040-charging.png
-%%DATADIR%%/icons/hicolor/48x48/status/gpm-primary-040.png
-%%DATADIR%%/icons/hicolor/48x48/status/gpm-primary-060-charging.png
-%%DATADIR%%/icons/hicolor/48x48/status/gpm-primary-060.png
-%%DATADIR%%/icons/hicolor/48x48/status/gpm-primary-080-charging.png
-%%DATADIR%%/icons/hicolor/48x48/status/gpm-primary-080.png
-%%DATADIR%%/icons/hicolor/48x48/status/gpm-primary-100-charging.png
-%%DATADIR%%/icons/hicolor/48x48/status/gpm-primary-100.png
-%%DATADIR%%/icons/hicolor/48x48/status/gpm-primary-charged.png
-%%DATADIR%%/icons/hicolor/48x48/status/gpm-primary-missing.png
-%%DATADIR%%/icons/hicolor/48x48/status/gpm-ups-000-charging.png
-%%DATADIR%%/icons/hicolor/48x48/status/gpm-ups-000.png
-%%DATADIR%%/icons/hicolor/48x48/status/gpm-ups-020-charging.png
-%%DATADIR%%/icons/hicolor/48x48/status/gpm-ups-020.png
-%%DATADIR%%/icons/hicolor/48x48/status/gpm-ups-040-charging.png
-%%DATADIR%%/icons/hicolor/48x48/status/gpm-ups-040.png
-%%DATADIR%%/icons/hicolor/48x48/status/gpm-ups-060-charging.png
-%%DATADIR%%/icons/hicolor/48x48/status/gpm-ups-060.png
-%%DATADIR%%/icons/hicolor/48x48/status/gpm-ups-080-charging.png
-%%DATADIR%%/icons/hicolor/48x48/status/gpm-ups-080.png
-%%DATADIR%%/icons/hicolor/48x48/status/gpm-ups-100-charging.png
-%%DATADIR%%/icons/hicolor/48x48/status/gpm-ups-100.png
-%%DATADIR%%/icons/hicolor/48x48/status/gpm-ups-charged.png
-%%DATADIR%%/icons/hicolor/48x48/status/gpm-ups-missing.png
-%%DATADIR%%/icons/hicolor/scalable/actions/gpm-hibernate.svg
-%%DATADIR%%/icons/hicolor/scalable/actions/gpm-suspend.svg
-%%DATADIR%%/icons/hicolor/scalable/status/gpm-ac-adapter.svg
-%%DATADIR%%/icons/hicolor/scalable/status/gpm-brightness-kbd-disabled.svg
-%%DATADIR%%/icons/hicolor/scalable/status/gpm-brightness-kbd-invalid.svg
-%%DATADIR%%/icons/hicolor/scalable/status/gpm-brightness-kbd.svg
-%%DATADIR%%/icons/hicolor/scalable/status/gpm-brightness-lcd-disabled.svg
-%%DATADIR%%/icons/hicolor/scalable/status/gpm-brightness-lcd-invalid.svg
-%%DATADIR%%/icons/hicolor/scalable/status/gpm-brightness-lcd.svg
-%%DATADIR%%/icons/hicolor/scalable/status/gpm-inhibit-invalid.svg
-%%DATADIR%%/icons/hicolor/scalable/status/gpm-inhibit.svg
-%%DATADIR%%/icons/hicolor/scalable/status/gpm-keyboard-000.svg
-%%DATADIR%%/icons/hicolor/scalable/status/gpm-keyboard-030.svg
-%%DATADIR%%/icons/hicolor/scalable/status/gpm-keyboard-060.svg
-%%DATADIR%%/icons/hicolor/scalable/status/gpm-keyboard-100.svg
-%%DATADIR%%/icons/hicolor/scalable/status/gpm-mouse-000.svg
-%%DATADIR%%/icons/hicolor/scalable/status/gpm-mouse-030.svg
-%%DATADIR%%/icons/hicolor/scalable/status/gpm-mouse-060.svg
-%%DATADIR%%/icons/hicolor/scalable/status/gpm-mouse-100.svg
-%%DATADIR%%/icons/hicolor/scalable/status/gpm-phone-000.svg
-%%DATADIR%%/icons/hicolor/scalable/status/gpm-phone-030.svg
-%%DATADIR%%/icons/hicolor/scalable/status/gpm-phone-060.svg
-%%DATADIR%%/icons/hicolor/scalable/status/gpm-phone-100.svg
-%%DATADIR%%/icons/hicolor/scalable/status/gpm-primary-000-charging.svg
-%%DATADIR%%/icons/hicolor/scalable/status/gpm-primary-000.svg
-%%DATADIR%%/icons/hicolor/scalable/status/gpm-primary-020-charging.svg
-%%DATADIR%%/icons/hicolor/scalable/status/gpm-primary-020.svg
-%%DATADIR%%/icons/hicolor/scalable/status/gpm-primary-040-charging.svg
-%%DATADIR%%/icons/hicolor/scalable/status/gpm-primary-040.svg
-%%DATADIR%%/icons/hicolor/scalable/status/gpm-primary-060-charging.svg
-%%DATADIR%%/icons/hicolor/scalable/status/gpm-primary-060.svg
-%%DATADIR%%/icons/hicolor/scalable/status/gpm-primary-080-charging.svg
-%%DATADIR%%/icons/hicolor/scalable/status/gpm-primary-080.svg
-%%DATADIR%%/icons/hicolor/scalable/status/gpm-primary-100-charging.svg
-%%DATADIR%%/icons/hicolor/scalable/status/gpm-primary-100.svg
-%%DATADIR%%/icons/hicolor/scalable/status/gpm-primary-charged.svg
-%%DATADIR%%/icons/hicolor/scalable/status/gpm-primary-missing.svg
-%%DATADIR%%/icons/hicolor/scalable/status/gpm-ups-000-charging.svg
-%%DATADIR%%/icons/hicolor/scalable/status/gpm-ups-000.svg
-%%DATADIR%%/icons/hicolor/scalable/status/gpm-ups-020-charging.svg
-%%DATADIR%%/icons/hicolor/scalable/status/gpm-ups-020.svg
-%%DATADIR%%/icons/hicolor/scalable/status/gpm-ups-040-charging.svg
-%%DATADIR%%/icons/hicolor/scalable/status/gpm-ups-040.svg
-%%DATADIR%%/icons/hicolor/scalable/status/gpm-ups-060-charging.svg
-%%DATADIR%%/icons/hicolor/scalable/status/gpm-ups-060.svg
-%%DATADIR%%/icons/hicolor/scalable/status/gpm-ups-080-charging.svg
-%%DATADIR%%/icons/hicolor/scalable/status/gpm-ups-080.svg
-%%DATADIR%%/icons/hicolor/scalable/status/gpm-ups-100-charging.svg
-%%DATADIR%%/icons/hicolor/scalable/status/gpm-ups-100.svg
-%%DATADIR%%/icons/hicolor/scalable/status/gpm-ups-charged.svg
-%%DATADIR%%/icons/hicolor/scalable/status/gpm-ups-missing.svg
-share/gnome/autostart/gnome-power-manager.desktop
-share/gnome/help/gnome-power-manager/C/figures/applet-brightness.png
-share/gnome/help/gnome-power-manager/C/figures/applet-inhibit.png
-share/gnome/help/gnome-power-manager/C/figures/gpm-cell-capacity.png
-share/gnome/help/gnome-power-manager/C/figures/gpm-charged.png
-share/gnome/help/gnome-power-manager/C/figures/gpm-critical.png
-share/gnome/help/gnome-power-manager/C/figures/gpm-low.png
-share/gnome/help/gnome-power-manager/C/figures/gpm-prefs-ac.png
-share/gnome/help/gnome-power-manager/C/figures/gpm-prefs-battery.png
-share/gnome/help/gnome-power-manager/C/figures/gpm-prefs-general.png
-share/gnome/help/gnome-power-manager/C/figures/gpm-stats-graph.png
-share/gnome/help/gnome-power-manager/C/figures/gpm-suspend-problem.png
-share/gnome/help/gnome-power-manager/C/figures/gpm-unplugged.png
-share/gnome/help/gnome-power-manager/C/figures/gs-prefs.png
-share/gnome/help/gnome-power-manager/C/gnome-power-manager.xml
-share/gnome/help/gnome-power-manager/C/legal.xml
-share/gnome/help/gnome-power-manager/ca/figures/applet-brightness.png
-share/gnome/help/gnome-power-manager/ca/figures/applet-inhibit.png
-share/gnome/help/gnome-power-manager/ca/figures/gpm-cell-capacity.png
-share/gnome/help/gnome-power-manager/ca/figures/gpm-charged.png
-share/gnome/help/gnome-power-manager/ca/figures/gpm-critical.png
-share/gnome/help/gnome-power-manager/ca/figures/gpm-low.png
-share/gnome/help/gnome-power-manager/ca/figures/gpm-prefs-ac.png
-share/gnome/help/gnome-power-manager/ca/figures/gpm-prefs-battery.png
-share/gnome/help/gnome-power-manager/ca/figures/gpm-prefs-general.png
-share/gnome/help/gnome-power-manager/ca/figures/gpm-stats-graph.png
-share/gnome/help/gnome-power-manager/ca/figures/gpm-suspend-problem.png
-share/gnome/help/gnome-power-manager/ca/figures/gpm-unplugged.png
-share/gnome/help/gnome-power-manager/ca/figures/gs-prefs.png
-share/gnome/help/gnome-power-manager/ca/gnome-power-manager.xml
-share/gnome/help/gnome-power-manager/es/figures/applet-brightness.png
-share/gnome/help/gnome-power-manager/es/figures/applet-inhibit.png
-share/gnome/help/gnome-power-manager/es/figures/gpm-cell-capacity.png
-share/gnome/help/gnome-power-manager/es/figures/gpm-charged.png
-share/gnome/help/gnome-power-manager/es/figures/gpm-critical.png
-share/gnome/help/gnome-power-manager/es/figures/gpm-low.png
-share/gnome/help/gnome-power-manager/es/figures/gpm-prefs-ac.png
-share/gnome/help/gnome-power-manager/es/figures/gpm-prefs-battery.png
-share/gnome/help/gnome-power-manager/es/figures/gpm-prefs-general.png
-share/gnome/help/gnome-power-manager/es/figures/gpm-stats-graph.png
-share/gnome/help/gnome-power-manager/es/figures/gpm-suspend-problem.png
-share/gnome/help/gnome-power-manager/es/figures/gpm-unplugged.png
-share/gnome/help/gnome-power-manager/es/figures/gs-prefs.png
-share/gnome/help/gnome-power-manager/es/gnome-power-manager.xml
-share/gnome/help/gnome-power-manager/fr/figures/applet-brightness.png
-share/gnome/help/gnome-power-manager/fr/figures/applet-inhibit.png
-share/gnome/help/gnome-power-manager/fr/figures/gpm-cell-capacity.png
-share/gnome/help/gnome-power-manager/fr/figures/gpm-charged.png
-share/gnome/help/gnome-power-manager/fr/figures/gpm-critical.png
-share/gnome/help/gnome-power-manager/fr/figures/gpm-low.png
-share/gnome/help/gnome-power-manager/fr/figures/gpm-prefs-ac.png
-share/gnome/help/gnome-power-manager/fr/figures/gpm-prefs-battery.png
-share/gnome/help/gnome-power-manager/fr/figures/gpm-prefs-general.png
-share/gnome/help/gnome-power-manager/fr/figures/gpm-stats-graph.png
-share/gnome/help/gnome-power-manager/fr/figures/gpm-suspend-problem.png
-share/gnome/help/gnome-power-manager/fr/figures/gpm-unplugged.png
-share/gnome/help/gnome-power-manager/fr/figures/gs-prefs.png
-share/gnome/help/gnome-power-manager/fr/gnome-power-manager.xml
-share/gnome/help/gnome-power-manager/hu/figures/applet-brightness.png
-share/gnome/help/gnome-power-manager/hu/figures/applet-inhibit.png
-share/gnome/help/gnome-power-manager/hu/figures/gpm-cell-capacity.png
-share/gnome/help/gnome-power-manager/hu/figures/gpm-charged.png
-share/gnome/help/gnome-power-manager/hu/figures/gpm-critical.png
-share/gnome/help/gnome-power-manager/hu/figures/gpm-low.png
-share/gnome/help/gnome-power-manager/hu/figures/gpm-prefs-ac.png
-share/gnome/help/gnome-power-manager/hu/figures/gpm-prefs-battery.png
-share/gnome/help/gnome-power-manager/hu/figures/gpm-prefs-general.png
-share/gnome/help/gnome-power-manager/hu/figures/gpm-stats-graph.png
-share/gnome/help/gnome-power-manager/hu/figures/gpm-suspend-problem.png
-share/gnome/help/gnome-power-manager/hu/figures/gpm-unplugged.png
-share/gnome/help/gnome-power-manager/hu/figures/gs-prefs.png
-share/gnome/help/gnome-power-manager/hu/gnome-power-manager.xml
-share/gnome/help/gnome-power-manager/it/figures/applet-brightness.png
-share/gnome/help/gnome-power-manager/it/figures/applet-inhibit.png
-share/gnome/help/gnome-power-manager/it/figures/gpm-cell-capacity.png
-share/gnome/help/gnome-power-manager/it/figures/gpm-charged.png
-share/gnome/help/gnome-power-manager/it/figures/gpm-critical.png
-share/gnome/help/gnome-power-manager/it/figures/gpm-low.png
-share/gnome/help/gnome-power-manager/it/figures/gpm-prefs-ac.png
-share/gnome/help/gnome-power-manager/it/figures/gpm-prefs-battery.png
-share/gnome/help/gnome-power-manager/it/figures/gpm-prefs-general.png
-share/gnome/help/gnome-power-manager/it/figures/gpm-stats-graph.png
-share/gnome/help/gnome-power-manager/it/figures/gpm-suspend-problem.png
-share/gnome/help/gnome-power-manager/it/figures/gpm-unplugged.png
-share/gnome/help/gnome-power-manager/it/figures/gs-prefs.png
-share/gnome/help/gnome-power-manager/it/gnome-power-manager.xml
-share/gnome/help/gnome-power-manager/oc/figures/applet-brightness.png
-share/gnome/help/gnome-power-manager/oc/figures/applet-inhibit.png
-share/gnome/help/gnome-power-manager/oc/figures/gpm-cell-capacity.png
-share/gnome/help/gnome-power-manager/oc/figures/gpm-charged.png
-share/gnome/help/gnome-power-manager/oc/figures/gpm-critical.png
-share/gnome/help/gnome-power-manager/oc/figures/gpm-low.png
-share/gnome/help/gnome-power-manager/oc/figures/gpm-prefs-ac.png
-share/gnome/help/gnome-power-manager/oc/figures/gpm-prefs-battery.png
-share/gnome/help/gnome-power-manager/oc/figures/gpm-prefs-general.png
-share/gnome/help/gnome-power-manager/oc/figures/gpm-stats-graph.png
-share/gnome/help/gnome-power-manager/oc/figures/gpm-suspend-problem.png
-share/gnome/help/gnome-power-manager/oc/figures/gpm-unplugged.png
-share/gnome/help/gnome-power-manager/oc/figures/gs-prefs.png
-share/gnome/help/gnome-power-manager/oc/gnome-power-manager.xml
-share/gnome/help/gnome-power-manager/pa/figures/applet-brightness.png
-share/gnome/help/gnome-power-manager/pa/figures/applet-inhibit.png
-share/gnome/help/gnome-power-manager/pa/figures/gpm-cell-capacity.png
-share/gnome/help/gnome-power-manager/pa/figures/gpm-charged.png
-share/gnome/help/gnome-power-manager/pa/figures/gpm-critical.png
-share/gnome/help/gnome-power-manager/pa/figures/gpm-low.png
-share/gnome/help/gnome-power-manager/pa/figures/gpm-prefs-ac.png
-share/gnome/help/gnome-power-manager/pa/figures/gpm-prefs-battery.png
-share/gnome/help/gnome-power-manager/pa/figures/gpm-prefs-general.png
-share/gnome/help/gnome-power-manager/pa/figures/gpm-stats-graph.png
-share/gnome/help/gnome-power-manager/pa/figures/gpm-suspend-problem.png
-share/gnome/help/gnome-power-manager/pa/figures/gpm-unplugged.png
-share/gnome/help/gnome-power-manager/pa/figures/gs-prefs.png
-share/gnome/help/gnome-power-manager/pa/gnome-power-manager.xml
-share/gnome/help/gnome-power-manager/ru/figures/applet-brightness.png
-share/gnome/help/gnome-power-manager/ru/figures/applet-inhibit.png
-share/gnome/help/gnome-power-manager/ru/figures/gpm-cell-capacity.png
-share/gnome/help/gnome-power-manager/ru/figures/gpm-charged.png
-share/gnome/help/gnome-power-manager/ru/figures/gpm-critical.png
-share/gnome/help/gnome-power-manager/ru/figures/gpm-low.png
-share/gnome/help/gnome-power-manager/ru/figures/gpm-prefs-ac.png
-share/gnome/help/gnome-power-manager/ru/figures/gpm-prefs-battery.png
-share/gnome/help/gnome-power-manager/ru/figures/gpm-prefs-general.png
-share/gnome/help/gnome-power-manager/ru/figures/gpm-stats-graph.png
-share/gnome/help/gnome-power-manager/ru/figures/gpm-suspend-problem.png
-share/gnome/help/gnome-power-manager/ru/figures/gpm-unplugged.png
-share/gnome/help/gnome-power-manager/ru/figures/gs-prefs.png
-share/gnome/help/gnome-power-manager/ru/gnome-power-manager.xml
-share/gnome/help/gnome-power-manager/sv/figures/applet-brightness.png
-share/gnome/help/gnome-power-manager/sv/figures/applet-inhibit.png
-share/gnome/help/gnome-power-manager/sv/figures/gpm-cell-capacity.png
-share/gnome/help/gnome-power-manager/sv/figures/gpm-charged.png
-share/gnome/help/gnome-power-manager/sv/figures/gpm-critical.png
-share/gnome/help/gnome-power-manager/sv/figures/gpm-low.png
-share/gnome/help/gnome-power-manager/sv/figures/gpm-prefs-ac.png
-share/gnome/help/gnome-power-manager/sv/figures/gpm-prefs-battery.png
-share/gnome/help/gnome-power-manager/sv/figures/gpm-prefs-general.png
-share/gnome/help/gnome-power-manager/sv/figures/gpm-stats-graph.png
-share/gnome/help/gnome-power-manager/sv/figures/gpm-suspend-problem.png
-share/gnome/help/gnome-power-manager/sv/figures/gpm-unplugged.png
-share/gnome/help/gnome-power-manager/sv/figures/gs-prefs.png
-share/gnome/help/gnome-power-manager/sv/gnome-power-manager.xml
-share/icons/hicolor/16x16/apps/gnome-brightness-applet.png
-share/icons/hicolor/16x16/apps/gnome-inhibit-applet.png
-share/icons/hicolor/16x16/apps/gnome-power-manager.png
-share/icons/hicolor/16x16/apps/gnome-power-statistics.png
-share/icons/hicolor/22x22/apps/gnome-brightness-applet.png
-share/icons/hicolor/22x22/apps/gnome-inhibit-applet.png
-share/icons/hicolor/22x22/apps/gnome-power-manager.png
-share/icons/hicolor/22x22/apps/gnome-power-statistics.png
-share/icons/hicolor/24x24/apps/gnome-brightness-applet.png
-share/icons/hicolor/24x24/apps/gnome-inhibit-applet.png
-share/icons/hicolor/24x24/apps/gnome-power-manager.png
-share/icons/hicolor/24x24/apps/gnome-power-statistics.png
-share/icons/hicolor/48x48/apps/gnome-brightness-applet.png
-share/icons/hicolor/48x48/apps/gnome-inhibit-applet.png
-share/icons/hicolor/48x48/apps/gnome-power-manager.png
-share/icons/hicolor/48x48/apps/gnome-power-statistics.png
-share/icons/hicolor/scalable/apps/gnome-brightness-applet.svg
-share/icons/hicolor/scalable/apps/gnome-inhibit-applet.svg
-share/icons/hicolor/scalable/apps/gnome-power-manager.svg
-share/icons/hicolor/scalable/apps/gnome-power-statistics.svg
-share/locale/ar/LC_MESSAGES/gnome-power-manager.mo
-share/locale/as/LC_MESSAGES/gnome-power-manager.mo
-share/locale/be@latin/LC_MESSAGES/gnome-power-manager.mo
-share/locale/bg/LC_MESSAGES/gnome-power-manager.mo
-share/locale/bn/LC_MESSAGES/gnome-power-manager.mo
-share/locale/bn_IN/LC_MESSAGES/gnome-power-manager.mo
-share/locale/ca/LC_MESSAGES/gnome-power-manager.mo
-share/locale/cs/LC_MESSAGES/gnome-power-manager.mo
-share/locale/cy/LC_MESSAGES/gnome-power-manager.mo
-share/locale/da/LC_MESSAGES/gnome-power-manager.mo
-share/locale/de/LC_MESSAGES/gnome-power-manager.mo
-share/locale/dz/LC_MESSAGES/gnome-power-manager.mo
-share/locale/el/LC_MESSAGES/gnome-power-manager.mo
-share/locale/en_CA/LC_MESSAGES/gnome-power-manager.mo
-share/locale/en_GB/LC_MESSAGES/gnome-power-manager.mo
-share/locale/es/LC_MESSAGES/gnome-power-manager.mo
-share/locale/et/LC_MESSAGES/gnome-power-manager.mo
-share/locale/eu/LC_MESSAGES/gnome-power-manager.mo
-share/locale/fa/LC_MESSAGES/gnome-power-manager.mo
-share/locale/fi/LC_MESSAGES/gnome-power-manager.mo
-share/locale/fr/LC_MESSAGES/gnome-power-manager.mo
-share/locale/ga/LC_MESSAGES/gnome-power-manager.mo
-share/locale/gl/LC_MESSAGES/gnome-power-manager.mo
-share/locale/gu/LC_MESSAGES/gnome-power-manager.mo
-share/locale/he/LC_MESSAGES/gnome-power-manager.mo
-share/locale/hi/LC_MESSAGES/gnome-power-manager.mo
-share/locale/hu/LC_MESSAGES/gnome-power-manager.mo
-share/locale/id/LC_MESSAGES/gnome-power-manager.mo
-share/locale/it/LC_MESSAGES/gnome-power-manager.mo
-share/locale/ja/LC_MESSAGES/gnome-power-manager.mo
-share/locale/ka/LC_MESSAGES/gnome-power-manager.mo
-share/locale/kn/LC_MESSAGES/gnome-power-manager.mo
-share/locale/ko/LC_MESSAGES/gnome-power-manager.mo
-share/locale/ku/LC_MESSAGES/gnome-power-manager.mo
-share/locale/lt/LC_MESSAGES/gnome-power-manager.mo
-share/locale/lv/LC_MESSAGES/gnome-power-manager.mo
-share/locale/mg/LC_MESSAGES/gnome-power-manager.mo
-share/locale/mk/LC_MESSAGES/gnome-power-manager.mo
-share/locale/ml/LC_MESSAGES/gnome-power-manager.mo
-share/locale/mr/LC_MESSAGES/gnome-power-manager.mo
-share/locale/nb/LC_MESSAGES/gnome-power-manager.mo
-share/locale/nl/LC_MESSAGES/gnome-power-manager.mo
-share/locale/nn/LC_MESSAGES/gnome-power-manager.mo
-share/locale/oc/LC_MESSAGES/gnome-power-manager.mo
-share/locale/or/LC_MESSAGES/gnome-power-manager.mo
-share/locale/pa/LC_MESSAGES/gnome-power-manager.mo
-share/locale/pl/LC_MESSAGES/gnome-power-manager.mo
-share/locale/pt/LC_MESSAGES/gnome-power-manager.mo
-share/locale/pt_BR/LC_MESSAGES/gnome-power-manager.mo
-share/locale/ro/LC_MESSAGES/gnome-power-manager.mo
-share/locale/ru/LC_MESSAGES/gnome-power-manager.mo
-share/locale/si/LC_MESSAGES/gnome-power-manager.mo
-share/locale/sk/LC_MESSAGES/gnome-power-manager.mo
-share/locale/sl/LC_MESSAGES/gnome-power-manager.mo
-share/locale/sr/LC_MESSAGES/gnome-power-manager.mo
-share/locale/sr@Latn/LC_MESSAGES/gnome-power-manager.mo
-share/locale/sv/LC_MESSAGES/gnome-power-manager.mo
-share/locale/ta/LC_MESSAGES/gnome-power-manager.mo
-share/locale/th/LC_MESSAGES/gnome-power-manager.mo
-share/locale/tr/LC_MESSAGES/gnome-power-manager.mo
-share/locale/uk/LC_MESSAGES/gnome-power-manager.mo
-share/locale/vi/LC_MESSAGES/gnome-power-manager.mo
-share/locale/zh_CN/LC_MESSAGES/gnome-power-manager.mo
-share/locale/zh_HK/LC_MESSAGES/gnome-power-manager.mo
-share/locale/zh_TW/LC_MESSAGES/gnome-power-manager.mo
-share/omf/gnome-power-manager/gnome-power-manager-C.omf
-share/omf/gnome-power-manager/gnome-power-manager-ca.omf
-share/omf/gnome-power-manager/gnome-power-manager-es.omf
-share/omf/gnome-power-manager/gnome-power-manager-fr.omf
-share/omf/gnome-power-manager/gnome-power-manager-hu.omf
-share/omf/gnome-power-manager/gnome-power-manager-it.omf
-share/omf/gnome-power-manager/gnome-power-manager-oc.omf
-share/omf/gnome-power-manager/gnome-power-manager-pa.omf
-share/omf/gnome-power-manager/gnome-power-manager-ru.omf
-share/omf/gnome-power-manager/gnome-power-manager-sv.omf
-@dirrm share/omf/gnome-power-manager
-@dirrm share/gnome/help/gnome-power-manager/sv/figures
-@dirrm share/gnome/help/gnome-power-manager/sv
-@dirrm share/gnome/help/gnome-power-manager/ru/figures
-@dirrm share/gnome/help/gnome-power-manager/ru
-@dirrm share/gnome/help/gnome-power-manager/pa/figures
-@dirrm share/gnome/help/gnome-power-manager/pa
-@dirrm share/gnome/help/gnome-power-manager/oc/figures
-@dirrm share/gnome/help/gnome-power-manager/oc
-@dirrm share/gnome/help/gnome-power-manager/it/figures
-@dirrm share/gnome/help/gnome-power-manager/it
-@dirrm share/gnome/help/gnome-power-manager/hu/figures
-@dirrm share/gnome/help/gnome-power-manager/hu
-@dirrm share/gnome/help/gnome-power-manager/fr/figures
-@dirrm share/gnome/help/gnome-power-manager/fr
-@dirrm share/gnome/help/gnome-power-manager/es/figures
-@dirrm share/gnome/help/gnome-power-manager/es
-@dirrm share/gnome/help/gnome-power-manager/ca/figures
-@dirrm share/gnome/help/gnome-power-manager/ca
-@dirrm share/gnome/help/gnome-power-manager/C/figures
-@dirrm share/gnome/help/gnome-power-manager/C
-@dirrm share/gnome/help/gnome-power-manager
-@dirrm %%DATADIR%%/icons/hicolor/scalable/status
-@dirrm %%DATADIR%%/icons/hicolor/scalable/actions
-@dirrm %%DATADIR%%/icons/hicolor/scalable
-@dirrm %%DATADIR%%/icons/hicolor/48x48/status
-@dirrm %%DATADIR%%/icons/hicolor/48x48/actions
-@dirrm %%DATADIR%%/icons/hicolor/48x48
-@dirrm %%DATADIR%%/icons/hicolor/24x24/status
-@dirrm %%DATADIR%%/icons/hicolor/24x24/actions
-@dirrm %%DATADIR%%/icons/hicolor/24x24
-@dirrm %%DATADIR%%/icons/hicolor/22x22/status
-@dirrm %%DATADIR%%/icons/hicolor/22x22/actions
-@dirrm %%DATADIR%%/icons/hicolor/22x22
-@dirrm %%DATADIR%%/icons/hicolor/16x16/status
-@dirrm %%DATADIR%%/icons/hicolor/16x16/actions
-@dirrm %%DATADIR%%/icons/hicolor/16x16
-@dirrm %%DATADIR%%/icons/hicolor
-@dirrm %%DATADIR%%/icons
-@dirrm %%DATADIR%%
-@dirrmtry share/applications
-@dirrmtry share/locale/zh_HK/LC_MESSAGES
-@dirrmtry share/locale/zh_HK
-@dirrmtry share/locale/si/LC_MESSAGES
-@dirrmtry share/locale/si
-@dirrmtry share/locale/oc/LC_MESSAGES
-@dirrmtry share/locale/oc
-@dirrmtry share/locale/mr/LC_MESSAGES
-@dirrmtry share/locale/mr
-@dirrmtry share/locale/mg/LC_MESSAGES
-@dirrmtry share/locale/mg
-@dirrmtry share/locale/ku/LC_MESSAGES
-@dirrmtry share/locale/ku
-@dirrmtry share/locale/dz/LC_MESSAGES
-@dirrmtry share/locale/dz
-@dirrmtry share/locale/bn_IN/LC_MESSAGES
-@dirrmtry share/locale/bn_IN
-@dirrmtry share/locale/be@latin/LC_MESSAGES
-@dirrmtry share/locale/be@latin
-@dirrmtry share/locale/as/LC_MESSAGES
-@dirrmtry share/locale/as
diff --git a/sysutils/gnome-settings-daemon/Makefile b/sysutils/gnome-settings-daemon/Makefile
deleted file mode 100644
index 4a923c30e..000000000
--- a/sysutils/gnome-settings-daemon/Makefile
+++ /dev/null
@@ -1,33 +0,0 @@
-# New ports collection makefile for:	gnome-settings-daemon
-# Date created:				14 Jan 2008
-# Whom:					Koop Mast <kwm@FreeBSD.org>
-#
-# $FreeBSD$
-#   $MCom: ports/sysutils/gnome-settings-daemon/Makefile,v 1.15 2008/03/10 21:07:12 mezz Exp $
-#
-
-PORTNAME=	gnome-settings-daemon
-PORTVERSION=	2.22.0
-CATEGORIES=	sysutils gnome
-MASTER_SITES=	GNOME
-
-MAINTAINER=	gnome@FreeBSD.org
-COMMENT=	GNOME 2 settings daemon
-
-USE_XORG=	xxf86misc
-USE_BZIP2=	yes
-USE_GMAKE=	yes
-USE_GNOME=	gnomeprefix intlhack gnomehack gnomedesktop libgnomekbd
-USE_GETTEXT=	yes
-USE_GSTREAMER=	good
-GNU_CONFIGURE=	yes
-CONFIGURE_ARGS=	--enable-gstreamer=0.10
-CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" \
-		LDFLAGS="-L${LOCALBASE}/lib"
-
-GCONF_SCHEMAS=	apps_gnome_settings_daemon_keybindings.schemas \
-		apps_gnome_settings_daemon_screensaver.schemas \
-		desktop_gnome_font_rendering.schemas \
-		gnome-settings-daemon.schemas
-
-.include <bsd.port.mk>
diff --git a/sysutils/gnome-settings-daemon/distinfo b/sysutils/gnome-settings-daemon/distinfo
deleted file mode 100644
index 677f21c81..000000000
--- a/sysutils/gnome-settings-daemon/distinfo
+++ /dev/null
@@ -1,3 +0,0 @@
-MD5 (gnome-settings-daemon-2.22.0.tar.bz2) = 5bb2b129342e3149c00892aa18926317
-SHA256 (gnome-settings-daemon-2.22.0.tar.bz2) = 265cc72958fd8ad66f7a7e2f98968bf74018c1391b5d8abb38ea1c6120c6aea5
-SIZE (gnome-settings-daemon-2.22.0.tar.bz2) = 1192937
diff --git a/sysutils/gnome-settings-daemon/files/patch-gsd_typing-break_gsd-typing-break-manager.c b/sysutils/gnome-settings-daemon/files/patch-gsd_typing-break_gsd-typing-break-manager.c
deleted file mode 100644
index 6fce0da18..000000000
--- a/sysutils/gnome-settings-daemon/files/patch-gsd_typing-break_gsd-typing-break-manager.c
+++ /dev/null
@@ -1,10 +0,0 @@
---- plugins/typing-break/gsd-typing-break-manager.c.orig	2008-01-14 01:20:09.000000000 +0100
-+++ plugins/typing-break/gsd-typing-break-manager.c	2008-01-14 01:20:37.000000000 +0100
-@@ -27,6 +27,7 @@
- #include <unistd.h>
- #include <string.h>
- #include <errno.h>
-+#include <sys/signal.h>
- 
- #include <locale.h>
- 
diff --git a/sysutils/gnome-settings-daemon/files/patch-plugins_media-keys_gsd-media-keys-manager.c b/sysutils/gnome-settings-daemon/files/patch-plugins_media-keys_gsd-media-keys-manager.c
deleted file mode 100644
index 1db1bb16e..000000000
--- a/sysutils/gnome-settings-daemon/files/patch-plugins_media-keys_gsd-media-keys-manager.c
+++ /dev/null
@@ -1,26 +0,0 @@
---- plugins/media-keys/gsd-media-keys-manager.c.orig	2008-01-29 15:58:30.000000000 -0600
-+++ plugins/media-keys/gsd-media-keys-manager.c	2008-01-29 16:00:55.000000000 -0600
-@@ -667,7 +667,11 @@
-         if ((command != NULL) && (strcmp (command, "") != 0)) {
-                 execute (manager, command, FALSE, FALSE);
-         } else {
-+#if __FreeBSD__
-+                execute (manager, "cdcontrol eject", FALSE, FALSE);
-+#else
-                 execute (manager, "eject -T", FALSE, FALSE);
-+#endif
-         }
- 
-         g_free (command);
-@@ -869,7 +873,11 @@
-                 do_mail_action (manager);
-                 break;
-         case SLEEP_KEY:
-+#if __FreeBSD__
-+                do_sleep_action ("zzz", "xset dpms force off");
-+#else
-                 do_sleep_action ("apm", "xset dpms force off");
-+#endif
-                 break;
-         case SCREENSAVER_KEY:
-                 if ((cmd = g_find_program_in_path ("gnome-screensaver-command"))) {
diff --git a/sysutils/gnome-settings-daemon/pkg-descr b/sysutils/gnome-settings-daemon/pkg-descr
deleted file mode 100644
index 42b586789..000000000
--- a/sysutils/gnome-settings-daemon/pkg-descr
+++ /dev/null
@@ -1 +0,0 @@
-GNOME 2 settings daemon.
diff --git a/sysutils/gnome-settings-daemon/pkg-plist b/sysutils/gnome-settings-daemon/pkg-plist
deleted file mode 100644
index 5b7ee38e5..000000000
--- a/sysutils/gnome-settings-daemon/pkg-plist
+++ /dev/null
@@ -1,187 +0,0 @@
-include/gnome-settings-daemon-2.0/gnome-settings-daemon/gnome-settings-client.h
-lib/gnome-settings-daemon-2.0/a11y-keyboard.gnome-settings-plugin
-lib/gnome-settings-daemon-2.0/background.gnome-settings-plugin
-lib/gnome-settings-daemon-2.0/clipboard.gnome-settings-plugin
-lib/gnome-settings-daemon-2.0/dummy.gnome-settings-plugin
-lib/gnome-settings-daemon-2.0/font.gnome-settings-plugin
-lib/gnome-settings-daemon-2.0/keybindings.gnome-settings-plugin
-lib/gnome-settings-daemon-2.0/keyboard.gnome-settings-plugin
-lib/gnome-settings-daemon-2.0/liba11y-keyboard.a
-lib/gnome-settings-daemon-2.0/liba11y-keyboard.la
-lib/gnome-settings-daemon-2.0/liba11y-keyboard.so
-lib/gnome-settings-daemon-2.0/libbackground.a
-lib/gnome-settings-daemon-2.0/libbackground.la
-lib/gnome-settings-daemon-2.0/libbackground.so
-lib/gnome-settings-daemon-2.0/libclipboard.a
-lib/gnome-settings-daemon-2.0/libclipboard.la
-lib/gnome-settings-daemon-2.0/libclipboard.so
-lib/gnome-settings-daemon-2.0/libdummy.a
-lib/gnome-settings-daemon-2.0/libdummy.la
-lib/gnome-settings-daemon-2.0/libdummy.so
-lib/gnome-settings-daemon-2.0/libfont.a
-lib/gnome-settings-daemon-2.0/libfont.la
-lib/gnome-settings-daemon-2.0/libfont.so
-lib/gnome-settings-daemon-2.0/libkeybindings.a
-lib/gnome-settings-daemon-2.0/libkeybindings.la
-lib/gnome-settings-daemon-2.0/libkeybindings.so
-lib/gnome-settings-daemon-2.0/libkeyboard.a
-lib/gnome-settings-daemon-2.0/libkeyboard.la
-lib/gnome-settings-daemon-2.0/libkeyboard.so
-lib/gnome-settings-daemon-2.0/libmedia-keys.a
-lib/gnome-settings-daemon-2.0/libmedia-keys.la
-lib/gnome-settings-daemon-2.0/libmedia-keys.so
-lib/gnome-settings-daemon-2.0/libmouse.a
-lib/gnome-settings-daemon-2.0/libmouse.la
-lib/gnome-settings-daemon-2.0/libmouse.so
-lib/gnome-settings-daemon-2.0/libscreensaver.a
-lib/gnome-settings-daemon-2.0/libscreensaver.la
-lib/gnome-settings-daemon-2.0/libscreensaver.so
-lib/gnome-settings-daemon-2.0/libsound.a
-lib/gnome-settings-daemon-2.0/libsound.la
-lib/gnome-settings-daemon-2.0/libsound.so
-lib/gnome-settings-daemon-2.0/libtyping-break.a
-lib/gnome-settings-daemon-2.0/libtyping-break.la
-lib/gnome-settings-daemon-2.0/libtyping-break.so
-lib/gnome-settings-daemon-2.0/libxrandr.a
-lib/gnome-settings-daemon-2.0/libxrandr.la
-lib/gnome-settings-daemon-2.0/libxrandr.so
-lib/gnome-settings-daemon-2.0/libxrdb.a
-lib/gnome-settings-daemon-2.0/libxrdb.la
-lib/gnome-settings-daemon-2.0/libxrdb.so
-lib/gnome-settings-daemon-2.0/libxsettings.a
-lib/gnome-settings-daemon-2.0/libxsettings.la
-lib/gnome-settings-daemon-2.0/libxsettings.so
-lib/gnome-settings-daemon-2.0/media-keys.gnome-settings-plugin
-lib/gnome-settings-daemon-2.0/mouse.gnome-settings-plugin
-lib/gnome-settings-daemon-2.0/screensaver.gnome-settings-plugin
-lib/gnome-settings-daemon-2.0/sound.gnome-settings-plugin
-lib/gnome-settings-daemon-2.0/typing-break.gnome-settings-plugin
-lib/gnome-settings-daemon-2.0/xrandr.gnome-settings-plugin
-lib/gnome-settings-daemon-2.0/xrdb.gnome-settings-plugin
-lib/gnome-settings-daemon-2.0/xsettings.gnome-settings-plugin
-libdata/pkgconfig/gnome-settings-daemon.pc
-libexec/gnome-settings-daemon
-share/dbus-1/services/org.gnome.SettingsDaemon.service
-%%DATADIR%%/acme-eject.png
-%%DATADIR%%/acme.glade
-%%DATADIR%%/modmap-dialog.glade
-%%DATADIR%%/xrdb/Editres.ad
-%%DATADIR%%/xrdb/Emacs.ad
-%%DATADIR%%/xrdb/General.ad
-%%DATADIR%%/xrdb/Motif.ad
-%%DATADIR%%/xrdb/Tk.ad
-%%DATADIR%%/xrdb/Xaw.ad
-share/locale/af/LC_MESSAGES/gnome-settings-daemon.mo
-share/locale/am/LC_MESSAGES/gnome-settings-daemon.mo
-share/locale/ar/LC_MESSAGES/gnome-settings-daemon.mo
-share/locale/az/LC_MESSAGES/gnome-settings-daemon.mo
-share/locale/be/LC_MESSAGES/gnome-settings-daemon.mo
-share/locale/be@latin/LC_MESSAGES/gnome-settings-daemon.mo
-share/locale/bg/LC_MESSAGES/gnome-settings-daemon.mo
-share/locale/bn/LC_MESSAGES/gnome-settings-daemon.mo
-share/locale/bn_IN/LC_MESSAGES/gnome-settings-daemon.mo
-share/locale/br/LC_MESSAGES/gnome-settings-daemon.mo
-share/locale/bs/LC_MESSAGES/gnome-settings-daemon.mo
-share/locale/ca/LC_MESSAGES/gnome-settings-daemon.mo
-share/locale/cs/LC_MESSAGES/gnome-settings-daemon.mo
-share/locale/cy/LC_MESSAGES/gnome-settings-daemon.mo
-share/locale/da/LC_MESSAGES/gnome-settings-daemon.mo
-share/locale/de/LC_MESSAGES/gnome-settings-daemon.mo
-share/locale/dz/LC_MESSAGES/gnome-settings-daemon.mo
-share/locale/el/LC_MESSAGES/gnome-settings-daemon.mo
-share/locale/en_CA/LC_MESSAGES/gnome-settings-daemon.mo
-share/locale/en_GB/LC_MESSAGES/gnome-settings-daemon.mo
-share/locale/es/LC_MESSAGES/gnome-settings-daemon.mo
-share/locale/et/LC_MESSAGES/gnome-settings-daemon.mo
-share/locale/eu/LC_MESSAGES/gnome-settings-daemon.mo
-share/locale/fa/LC_MESSAGES/gnome-settings-daemon.mo
-share/locale/fi/LC_MESSAGES/gnome-settings-daemon.mo
-share/locale/fr/LC_MESSAGES/gnome-settings-daemon.mo
-share/locale/ga/LC_MESSAGES/gnome-settings-daemon.mo
-share/locale/gl/LC_MESSAGES/gnome-settings-daemon.mo
-share/locale/gu/LC_MESSAGES/gnome-settings-daemon.mo
-share/locale/he/LC_MESSAGES/gnome-settings-daemon.mo
-share/locale/hi/LC_MESSAGES/gnome-settings-daemon.mo
-share/locale/hr/LC_MESSAGES/gnome-settings-daemon.mo
-share/locale/hu/LC_MESSAGES/gnome-settings-daemon.mo
-share/locale/id/LC_MESSAGES/gnome-settings-daemon.mo
-share/locale/is/LC_MESSAGES/gnome-settings-daemon.mo
-share/locale/it/LC_MESSAGES/gnome-settings-daemon.mo
-share/locale/ja/LC_MESSAGES/gnome-settings-daemon.mo
-share/locale/ka/LC_MESSAGES/gnome-settings-daemon.mo
-share/locale/ko/LC_MESSAGES/gnome-settings-daemon.mo
-share/locale/ku/LC_MESSAGES/gnome-settings-daemon.mo
-share/locale/lt/LC_MESSAGES/gnome-settings-daemon.mo
-share/locale/lv/LC_MESSAGES/gnome-settings-daemon.mo
-share/locale/mg/LC_MESSAGES/gnome-settings-daemon.mo
-share/locale/mk/LC_MESSAGES/gnome-settings-daemon.mo
-share/locale/ml/LC_MESSAGES/gnome-settings-daemon.mo
-share/locale/mn/LC_MESSAGES/gnome-settings-daemon.mo
-share/locale/mr/LC_MESSAGES/gnome-settings-daemon.mo
-share/locale/ms/LC_MESSAGES/gnome-settings-daemon.mo
-share/locale/nb/LC_MESSAGES/gnome-settings-daemon.mo
-share/locale/ne/LC_MESSAGES/gnome-settings-daemon.mo
-share/locale/nl/LC_MESSAGES/gnome-settings-daemon.mo
-share/locale/nn/LC_MESSAGES/gnome-settings-daemon.mo
-share/locale/nso/LC_MESSAGES/gnome-settings-daemon.mo
-share/locale/oc/LC_MESSAGES/gnome-settings-daemon.mo
-share/locale/or/LC_MESSAGES/gnome-settings-daemon.mo
-share/locale/pa/LC_MESSAGES/gnome-settings-daemon.mo
-share/locale/pl/LC_MESSAGES/gnome-settings-daemon.mo
-share/locale/pt/LC_MESSAGES/gnome-settings-daemon.mo
-share/locale/pt_BR/LC_MESSAGES/gnome-settings-daemon.mo
-share/locale/ro/LC_MESSAGES/gnome-settings-daemon.mo
-share/locale/ru/LC_MESSAGES/gnome-settings-daemon.mo
-share/locale/rw/LC_MESSAGES/gnome-settings-daemon.mo
-share/locale/si/LC_MESSAGES/gnome-settings-daemon.mo
-share/locale/sk/LC_MESSAGES/gnome-settings-daemon.mo
-share/locale/sl/LC_MESSAGES/gnome-settings-daemon.mo
-share/locale/sq/LC_MESSAGES/gnome-settings-daemon.mo
-share/locale/sr/LC_MESSAGES/gnome-settings-daemon.mo
-share/locale/sr@Latn/LC_MESSAGES/gnome-settings-daemon.mo
-share/locale/sv/LC_MESSAGES/gnome-settings-daemon.mo
-share/locale/ta/LC_MESSAGES/gnome-settings-daemon.mo
-share/locale/te/LC_MESSAGES/gnome-settings-daemon.mo
-share/locale/th/LC_MESSAGES/gnome-settings-daemon.mo
-share/locale/tr/LC_MESSAGES/gnome-settings-daemon.mo
-share/locale/uk/LC_MESSAGES/gnome-settings-daemon.mo
-share/locale/vi/LC_MESSAGES/gnome-settings-daemon.mo
-share/locale/wa/LC_MESSAGES/gnome-settings-daemon.mo
-share/locale/xh/LC_MESSAGES/gnome-settings-daemon.mo
-share/locale/zh_CN/LC_MESSAGES/gnome-settings-daemon.mo
-share/locale/zh_HK/LC_MESSAGES/gnome-settings-daemon.mo
-share/locale/zh_TW/LC_MESSAGES/gnome-settings-daemon.mo
-share/locale/zu/LC_MESSAGES/gnome-settings-daemon.mo
-@dirrm %%DATADIR%%/xrdb
-@dirrm %%DATADIR%%
-@dirrm lib/gnome-settings-daemon-2.0
-@dirrm include/gnome-settings-daemon-2.0/gnome-settings-daemon
-@dirrm include/gnome-settings-daemon-2.0
-@dirrmtry share/locale/zu/LC_MESSAGES
-@dirrmtry share/locale/zu
-@dirrmtry share/locale/zh_HK/LC_MESSAGES
-@dirrmtry share/locale/zh_HK
-@dirrmtry share/locale/xh/LC_MESSAGES
-@dirrmtry share/locale/xh
-@dirrmtry share/locale/te/LC_MESSAGES
-@dirrmtry share/locale/te
-@dirrmtry share/locale/si/LC_MESSAGES
-@dirrmtry share/locale/si
-@dirrmtry share/locale/rw/LC_MESSAGES
-@dirrmtry share/locale/rw
-@dirrmtry share/locale/oc/LC_MESSAGES
-@dirrmtry share/locale/oc
-@dirrmtry share/locale/nso/LC_MESSAGES
-@dirrmtry share/locale/nso
-@dirrmtry share/locale/mr/LC_MESSAGES
-@dirrmtry share/locale/mr
-@dirrmtry share/locale/mg/LC_MESSAGES
-@dirrmtry share/locale/mg
-@dirrmtry share/locale/ku/LC_MESSAGES
-@dirrmtry share/locale/ku
-@dirrmtry share/locale/dz/LC_MESSAGES
-@dirrmtry share/locale/dz
-@dirrmtry share/locale/bn_IN/LC_MESSAGES
-@dirrmtry share/locale/bn_IN
-@dirrmtry share/locale/be@latin/LC_MESSAGES
-@dirrmtry share/locale/be@latin
diff --git a/sysutils/gnome-system-monitor/Makefile b/sysutils/gnome-system-monitor/Makefile
deleted file mode 100644
index 3d4896d86..000000000
--- a/sysutils/gnome-system-monitor/Makefile
+++ /dev/null
@@ -1,38 +0,0 @@
-# New ports collection makefile for:	gnomesystemmonitor
-# Date created:				09 May 2002
-# Whom:					Joe Marcus Clarke <marcus@FreeBSD.org>
-#
-# $FreeBSD$
-#   $MCom: ports/sysutils/gnome-system-monitor/Makefile,v 1.116 2008/02/25 23:06:01 mezz Exp $
-#
-
-PORTNAME=	gnome-system-monitor
-PORTVERSION=	2.22.0
-CATEGORIES=	sysutils gnome
-MASTER_SITES=	GNOME
-DISTNAME=	gnome-system-monitor-${PORTVERSION}
-DIST_SUBDIR=	gnome2
-
-MAINTAINER=	gnome@FreeBSD.org
-COMMENT=	GNOME 2 system monitor program
-
-BUILD_DEPENDS=	${LOCALBASE}/libdata/pkgconfig/gnome-icon-theme.pc:${PORTSDIR}/misc/gnome-icon-theme
-LIB_DEPENDS=	gtop-2.0.7:${PORTSDIR}/devel/libgtop \
-		gtkmm-2.4.1:${PORTSDIR}/x11-toolkits/gtkmm24
-RUN_DEPENDS=	${LOCALBASE}/libdata/pkgconfig/gnome-icon-theme.pc:${PORTSDIR}/misc/gnome-icon-theme
-
-USE_BZIP2=	yes
-USE_GETTEXT=	yes
-USE_XLIB=	yes
-INSTALLS_OMF=	yes
-USE_GMAKE=	yes
-USE_GNOME=	gnomeprefix intlhack gnomehack libwnck gnomevfs2 gnomedocutils \
-		librsvg2
-GNU_CONFIGURE=	yes
-CONFIGURE_ARGS=	--enable-pcrecpp
-CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" \
-		LIBS="-L${LOCALBASE}/lib -lutil"
-
-GCONF_SCHEMAS=	gnome-system-monitor.schemas
-
-.include <bsd.port.mk>
diff --git a/sysutils/gnome-system-monitor/distinfo b/sysutils/gnome-system-monitor/distinfo
deleted file mode 100644
index d8b8f50d4..000000000
--- a/sysutils/gnome-system-monitor/distinfo
+++ /dev/null
@@ -1,3 +0,0 @@
-MD5 (gnome2/gnome-system-monitor-2.22.0.tar.bz2) = 7b809a4db72902ca5f47a63f62917d14
-SHA256 (gnome2/gnome-system-monitor-2.22.0.tar.bz2) = a2e6b6c185063fc43e6d6293a64cd3fa6f32be58b682bc58e5913c94aa3cd1e2
-SIZE (gnome2/gnome-system-monitor-2.22.0.tar.bz2) = 1935178
diff --git a/sysutils/gnome-system-monitor/files/patch-src_load-graph.cpp b/sysutils/gnome-system-monitor/files/patch-src_load-graph.cpp
deleted file mode 100644
index e57a21704..000000000
--- a/sysutils/gnome-system-monitor/files/patch-src_load-graph.cpp
+++ /dev/null
@@ -1,11 +0,0 @@
---- src/load-graph.cpp.orig	2008-01-14 23:43:43.000000000 -0600
-+++ src/load-graph.cpp	2008-01-14 23:44:15.000000000 -0600
-@@ -501,7 +501,7 @@
- 	// e.g: ceil(100.5 KiB) = 101 KiB = 101 * 2**(1 * 10)
- 	//      where base10 = 1, coef10 = 101, pow2 = 16
- 
--	unsigned pow2 = std::floor(log2(new_max));
-+	unsigned pow2 = std::floor(log(new_max) / log(2));
- 	unsigned base10 = pow2 / 10;
- 	unsigned coef10 = std::ceil(new_max / double(1UL << (base10 * 10)));
- 	g_assert(new_max <= (coef10 * (1UL << (base10 * 10))));
diff --git a/sysutils/gnome-system-monitor/pkg-descr b/sysutils/gnome-system-monitor/pkg-descr
deleted file mode 100644
index 40caee647..000000000
--- a/sysutils/gnome-system-monitor/pkg-descr
+++ /dev/null
@@ -1 +0,0 @@
-GNOME 2.0 system monitor program.
diff --git a/sysutils/gnome-system-monitor/pkg-plist b/sysutils/gnome-system-monitor/pkg-plist
deleted file mode 100644
index 4ed8d93f7..000000000
--- a/sysutils/gnome-system-monitor/pkg-plist
+++ /dev/null
@@ -1,247 +0,0 @@
-bin/gnome-system-monitor
-share/applications/gnome-system-monitor.desktop
-share/gnome/help/gnome-system-monitor/C/figures/addColumn.png
-share/gnome/help/gnome-system-monitor/C/figures/changePriority.png
-share/gnome/help/gnome-system-monitor/C/figures/colorPanel.png
-share/gnome/help/gnome-system-monitor/C/figures/columnContextMenu.png
-share/gnome/help/gnome-system-monitor/C/figures/gnome-system-monitor_window.png
-share/gnome/help/gnome-system-monitor/C/figures/memoryMaps.png
-share/gnome/help/gnome-system-monitor/C/figures/moreInfo.png
-share/gnome/help/gnome-system-monitor/C/figures/processListing.png
-share/gnome/help/gnome-system-monitor/C/figures/sortButton.png
-share/gnome/help/gnome-system-monitor/C/figures/sortMenu.png
-share/gnome/help/gnome-system-monitor/C/figures/sortMenu2.png
-share/gnome/help/gnome-system-monitor/C/figures/systemMonitor.png
-share/gnome/help/gnome-system-monitor/C/figures/viewMenu.png
-share/gnome/help/gnome-system-monitor/C/gnome-system-monitor.xml
-share/gnome/help/gnome-system-monitor/C/legal.xml
-share/gnome/help/gnome-system-monitor/bg/figures/addColumn.png
-share/gnome/help/gnome-system-monitor/bg/figures/changePriority.png
-share/gnome/help/gnome-system-monitor/bg/figures/colorPanel.png
-share/gnome/help/gnome-system-monitor/bg/figures/columnContextMenu.png
-share/gnome/help/gnome-system-monitor/bg/figures/gnome-system-monitor_window.png
-share/gnome/help/gnome-system-monitor/bg/figures/memoryMaps.png
-share/gnome/help/gnome-system-monitor/bg/figures/moreInfo.png
-share/gnome/help/gnome-system-monitor/bg/figures/processListing.png
-share/gnome/help/gnome-system-monitor/bg/figures/sortButton.png
-share/gnome/help/gnome-system-monitor/bg/figures/sortMenu.png
-share/gnome/help/gnome-system-monitor/bg/figures/sortMenu2.png
-share/gnome/help/gnome-system-monitor/bg/figures/systemMonitor.png
-share/gnome/help/gnome-system-monitor/bg/figures/viewMenu.png
-share/gnome/help/gnome-system-monitor/bg/gnome-system-monitor.xml
-share/gnome/help/gnome-system-monitor/ca/figures/addColumn.png
-share/gnome/help/gnome-system-monitor/ca/figures/changePriority.png
-share/gnome/help/gnome-system-monitor/ca/figures/colorPanel.png
-share/gnome/help/gnome-system-monitor/ca/figures/columnContextMenu.png
-share/gnome/help/gnome-system-monitor/ca/figures/gnome-system-monitor_window.png
-share/gnome/help/gnome-system-monitor/ca/figures/memoryMaps.png
-share/gnome/help/gnome-system-monitor/ca/figures/moreInfo.png
-share/gnome/help/gnome-system-monitor/ca/figures/processListing.png
-share/gnome/help/gnome-system-monitor/ca/figures/sortButton.png
-share/gnome/help/gnome-system-monitor/ca/figures/sortMenu.png
-share/gnome/help/gnome-system-monitor/ca/figures/sortMenu2.png
-share/gnome/help/gnome-system-monitor/ca/figures/systemMonitor.png
-share/gnome/help/gnome-system-monitor/ca/figures/viewMenu.png
-share/gnome/help/gnome-system-monitor/ca/gnome-system-monitor.xml
-share/gnome/help/gnome-system-monitor/es/figures/addColumn.png
-share/gnome/help/gnome-system-monitor/es/figures/changePriority.png
-share/gnome/help/gnome-system-monitor/es/figures/colorPanel.png
-share/gnome/help/gnome-system-monitor/es/figures/columnContextMenu.png
-share/gnome/help/gnome-system-monitor/es/figures/gnome-system-monitor_window.png
-share/gnome/help/gnome-system-monitor/es/figures/memoryMaps.png
-share/gnome/help/gnome-system-monitor/es/figures/moreInfo.png
-share/gnome/help/gnome-system-monitor/es/figures/processListing.png
-share/gnome/help/gnome-system-monitor/es/figures/sortButton.png
-share/gnome/help/gnome-system-monitor/es/figures/sortMenu.png
-share/gnome/help/gnome-system-monitor/es/figures/sortMenu2.png
-share/gnome/help/gnome-system-monitor/es/figures/systemMonitor.png
-share/gnome/help/gnome-system-monitor/es/figures/viewMenu.png
-share/gnome/help/gnome-system-monitor/es/gnome-system-monitor.xml
-share/gnome/help/gnome-system-monitor/fr/figures/addColumn.png
-share/gnome/help/gnome-system-monitor/fr/figures/changePriority.png
-share/gnome/help/gnome-system-monitor/fr/figures/colorPanel.png
-share/gnome/help/gnome-system-monitor/fr/figures/columnContextMenu.png
-share/gnome/help/gnome-system-monitor/fr/figures/gnome-system-monitor_window.png
-share/gnome/help/gnome-system-monitor/fr/figures/memoryMaps.png
-share/gnome/help/gnome-system-monitor/fr/figures/moreInfo.png
-share/gnome/help/gnome-system-monitor/fr/figures/processListing.png
-share/gnome/help/gnome-system-monitor/fr/figures/sortButton.png
-share/gnome/help/gnome-system-monitor/fr/figures/sortMenu.png
-share/gnome/help/gnome-system-monitor/fr/figures/sortMenu2.png
-share/gnome/help/gnome-system-monitor/fr/figures/systemMonitor.png
-share/gnome/help/gnome-system-monitor/fr/figures/viewMenu.png
-share/gnome/help/gnome-system-monitor/fr/gnome-system-monitor.xml
-share/gnome/help/gnome-system-monitor/oc/figures/addColumn.png
-share/gnome/help/gnome-system-monitor/oc/figures/changePriority.png
-share/gnome/help/gnome-system-monitor/oc/figures/colorPanel.png
-share/gnome/help/gnome-system-monitor/oc/figures/columnContextMenu.png
-share/gnome/help/gnome-system-monitor/oc/figures/gnome-system-monitor_window.png
-share/gnome/help/gnome-system-monitor/oc/figures/memoryMaps.png
-share/gnome/help/gnome-system-monitor/oc/figures/moreInfo.png
-share/gnome/help/gnome-system-monitor/oc/figures/processListing.png
-share/gnome/help/gnome-system-monitor/oc/figures/sortButton.png
-share/gnome/help/gnome-system-monitor/oc/figures/sortMenu.png
-share/gnome/help/gnome-system-monitor/oc/figures/sortMenu2.png
-share/gnome/help/gnome-system-monitor/oc/figures/systemMonitor.png
-share/gnome/help/gnome-system-monitor/oc/figures/viewMenu.png
-share/gnome/help/gnome-system-monitor/oc/gnome-system-monitor.xml
-share/gnome/help/gnome-system-monitor/pa/figures/addColumn.png
-share/gnome/help/gnome-system-monitor/pa/figures/changePriority.png
-share/gnome/help/gnome-system-monitor/pa/figures/colorPanel.png
-share/gnome/help/gnome-system-monitor/pa/figures/columnContextMenu.png
-share/gnome/help/gnome-system-monitor/pa/figures/gnome-system-monitor_window.png
-share/gnome/help/gnome-system-monitor/pa/figures/memoryMaps.png
-share/gnome/help/gnome-system-monitor/pa/figures/moreInfo.png
-share/gnome/help/gnome-system-monitor/pa/figures/processListing.png
-share/gnome/help/gnome-system-monitor/pa/figures/sortButton.png
-share/gnome/help/gnome-system-monitor/pa/figures/sortMenu.png
-share/gnome/help/gnome-system-monitor/pa/figures/sortMenu2.png
-share/gnome/help/gnome-system-monitor/pa/figures/systemMonitor.png
-share/gnome/help/gnome-system-monitor/pa/figures/viewMenu.png
-share/gnome/help/gnome-system-monitor/pa/gnome-system-monitor.xml
-share/gnome/help/gnome-system-monitor/sv/figures/addColumn.png
-share/gnome/help/gnome-system-monitor/sv/figures/changePriority.png
-share/gnome/help/gnome-system-monitor/sv/figures/colorPanel.png
-share/gnome/help/gnome-system-monitor/sv/figures/columnContextMenu.png
-share/gnome/help/gnome-system-monitor/sv/figures/gnome-system-monitor_window.png
-share/gnome/help/gnome-system-monitor/sv/figures/memoryMaps.png
-share/gnome/help/gnome-system-monitor/sv/figures/moreInfo.png
-share/gnome/help/gnome-system-monitor/sv/figures/processListing.png
-share/gnome/help/gnome-system-monitor/sv/figures/sortButton.png
-share/gnome/help/gnome-system-monitor/sv/figures/sortMenu.png
-share/gnome/help/gnome-system-monitor/sv/figures/sortMenu2.png
-share/gnome/help/gnome-system-monitor/sv/figures/systemMonitor.png
-share/gnome/help/gnome-system-monitor/sv/figures/viewMenu.png
-share/gnome/help/gnome-system-monitor/sv/gnome-system-monitor.xml
-share/locale/am/LC_MESSAGES/gnome-system-monitor.mo
-share/locale/ar/LC_MESSAGES/gnome-system-monitor.mo
-share/locale/az/LC_MESSAGES/gnome-system-monitor.mo
-share/locale/be/LC_MESSAGES/gnome-system-monitor.mo
-share/locale/be@latin/LC_MESSAGES/gnome-system-monitor.mo
-share/locale/bg/LC_MESSAGES/gnome-system-monitor.mo
-share/locale/bn/LC_MESSAGES/gnome-system-monitor.mo
-share/locale/bn_IN/LC_MESSAGES/gnome-system-monitor.mo
-share/locale/bs/LC_MESSAGES/gnome-system-monitor.mo
-share/locale/ca/LC_MESSAGES/gnome-system-monitor.mo
-share/locale/cs/LC_MESSAGES/gnome-system-monitor.mo
-share/locale/cy/LC_MESSAGES/gnome-system-monitor.mo
-share/locale/da/LC_MESSAGES/gnome-system-monitor.mo
-share/locale/de/LC_MESSAGES/gnome-system-monitor.mo
-share/locale/dz/LC_MESSAGES/gnome-system-monitor.mo
-share/locale/el/LC_MESSAGES/gnome-system-monitor.mo
-share/locale/en_CA/LC_MESSAGES/gnome-system-monitor.mo
-share/locale/en_GB/LC_MESSAGES/gnome-system-monitor.mo
-share/locale/es/LC_MESSAGES/gnome-system-monitor.mo
-share/locale/et/LC_MESSAGES/gnome-system-monitor.mo
-share/locale/eu/LC_MESSAGES/gnome-system-monitor.mo
-share/locale/fa/LC_MESSAGES/gnome-system-monitor.mo
-share/locale/fi/LC_MESSAGES/gnome-system-monitor.mo
-share/locale/fr/LC_MESSAGES/gnome-system-monitor.mo
-share/locale/ga/LC_MESSAGES/gnome-system-monitor.mo
-share/locale/gl/LC_MESSAGES/gnome-system-monitor.mo
-share/locale/gu/LC_MESSAGES/gnome-system-monitor.mo
-share/locale/he/LC_MESSAGES/gnome-system-monitor.mo
-share/locale/hi/LC_MESSAGES/gnome-system-monitor.mo
-share/locale/hr/LC_MESSAGES/gnome-system-monitor.mo
-share/locale/hu/LC_MESSAGES/gnome-system-monitor.mo
-share/locale/id/LC_MESSAGES/gnome-system-monitor.mo
-share/locale/it/LC_MESSAGES/gnome-system-monitor.mo
-share/locale/ja/LC_MESSAGES/gnome-system-monitor.mo
-share/locale/ka/LC_MESSAGES/gnome-system-monitor.mo
-share/locale/kn/LC_MESSAGES/gnome-system-monitor.mo
-share/locale/ko/LC_MESSAGES/gnome-system-monitor.mo
-share/locale/ku/LC_MESSAGES/gnome-system-monitor.mo
-share/locale/li/LC_MESSAGES/gnome-system-monitor.mo
-share/locale/lt/LC_MESSAGES/gnome-system-monitor.mo
-share/locale/lv/LC_MESSAGES/gnome-system-monitor.mo
-share/locale/mg/LC_MESSAGES/gnome-system-monitor.mo
-share/locale/mk/LC_MESSAGES/gnome-system-monitor.mo
-share/locale/ml/LC_MESSAGES/gnome-system-monitor.mo
-share/locale/mn/LC_MESSAGES/gnome-system-monitor.mo
-share/locale/mr/LC_MESSAGES/gnome-system-monitor.mo
-share/locale/ms/LC_MESSAGES/gnome-system-monitor.mo
-share/locale/nb/LC_MESSAGES/gnome-system-monitor.mo
-share/locale/ne/LC_MESSAGES/gnome-system-monitor.mo
-share/locale/nl/LC_MESSAGES/gnome-system-monitor.mo
-share/locale/nn/LC_MESSAGES/gnome-system-monitor.mo
-share/locale/oc/LC_MESSAGES/gnome-system-monitor.mo
-share/locale/or/LC_MESSAGES/gnome-system-monitor.mo
-share/locale/pa/LC_MESSAGES/gnome-system-monitor.mo
-share/locale/pl/LC_MESSAGES/gnome-system-monitor.mo
-share/locale/pt/LC_MESSAGES/gnome-system-monitor.mo
-share/locale/pt_BR/LC_MESSAGES/gnome-system-monitor.mo
-share/locale/ro/LC_MESSAGES/gnome-system-monitor.mo
-share/locale/ru/LC_MESSAGES/gnome-system-monitor.mo
-share/locale/rw/LC_MESSAGES/gnome-system-monitor.mo
-share/locale/si/LC_MESSAGES/gnome-system-monitor.mo
-share/locale/sk/LC_MESSAGES/gnome-system-monitor.mo
-share/locale/sl/LC_MESSAGES/gnome-system-monitor.mo
-share/locale/sq/LC_MESSAGES/gnome-system-monitor.mo
-share/locale/sr/LC_MESSAGES/gnome-system-monitor.mo
-share/locale/sr@Latn/LC_MESSAGES/gnome-system-monitor.mo
-share/locale/sv/LC_MESSAGES/gnome-system-monitor.mo
-share/locale/ta/LC_MESSAGES/gnome-system-monitor.mo
-share/locale/te/LC_MESSAGES/gnome-system-monitor.mo
-share/locale/th/LC_MESSAGES/gnome-system-monitor.mo
-share/locale/tr/LC_MESSAGES/gnome-system-monitor.mo
-share/locale/ug/LC_MESSAGES/gnome-system-monitor.mo
-share/locale/uk/LC_MESSAGES/gnome-system-monitor.mo
-share/locale/vi/LC_MESSAGES/gnome-system-monitor.mo
-share/locale/zh_CN/LC_MESSAGES/gnome-system-monitor.mo
-share/locale/zh_HK/LC_MESSAGES/gnome-system-monitor.mo
-share/locale/zh_TW/LC_MESSAGES/gnome-system-monitor.mo
-share/omf/gnome-system-monitor/gnome-system-monitor-C.omf
-share/omf/gnome-system-monitor/gnome-system-monitor-bg.omf
-share/omf/gnome-system-monitor/gnome-system-monitor-ca.omf
-share/omf/gnome-system-monitor/gnome-system-monitor-es.omf
-share/omf/gnome-system-monitor/gnome-system-monitor-fr.omf
-share/omf/gnome-system-monitor/gnome-system-monitor-oc.omf
-share/omf/gnome-system-monitor/gnome-system-monitor-pa.omf
-share/omf/gnome-system-monitor/gnome-system-monitor-sv.omf
-share/pixmaps/gnome-system-monitor/download.svg
-share/pixmaps/gnome-system-monitor/side.png
-share/pixmaps/gnome-system-monitor/upload.svg
-@dirrm share/pixmaps/gnome-system-monitor
-@dirrm share/omf/gnome-system-monitor
-@dirrm share/gnome/help/gnome-system-monitor/sv/figures
-@dirrm share/gnome/help/gnome-system-monitor/sv
-@dirrm share/gnome/help/gnome-system-monitor/pa/figures
-@dirrm share/gnome/help/gnome-system-monitor/pa
-@dirrm share/gnome/help/gnome-system-monitor/oc/figures
-@dirrm share/gnome/help/gnome-system-monitor/oc
-@dirrm share/gnome/help/gnome-system-monitor/fr/figures
-@dirrm share/gnome/help/gnome-system-monitor/fr
-@dirrm share/gnome/help/gnome-system-monitor/es/figures
-@dirrm share/gnome/help/gnome-system-monitor/es
-@dirrm share/gnome/help/gnome-system-monitor/ca/figures
-@dirrm share/gnome/help/gnome-system-monitor/ca
-@dirrm share/gnome/help/gnome-system-monitor/bg/figures
-@dirrm share/gnome/help/gnome-system-monitor/bg
-@dirrm share/gnome/help/gnome-system-monitor/C/figures
-@dirrm share/gnome/help/gnome-system-monitor/C
-@dirrm share/gnome/help/gnome-system-monitor
-@dirrmtry share/applications
-@dirrmtry share/locale/zh_HK/LC_MESSAGES
-@dirrmtry share/locale/zh_HK
-@dirrmtry share/locale/ug/LC_MESSAGES
-@dirrmtry share/locale/ug
-@dirrmtry share/locale/te/LC_MESSAGES
-@dirrmtry share/locale/te
-@dirrmtry share/locale/si/LC_MESSAGES
-@dirrmtry share/locale/si
-@dirrmtry share/locale/rw/LC_MESSAGES
-@dirrmtry share/locale/rw
-@dirrmtry share/locale/oc/LC_MESSAGES
-@dirrmtry share/locale/oc
-@dirrmtry share/locale/mr/LC_MESSAGES
-@dirrmtry share/locale/mr
-@dirrmtry share/locale/mg/LC_MESSAGES
-@dirrmtry share/locale/mg
-@dirrmtry share/locale/ku/LC_MESSAGES
-@dirrmtry share/locale/ku
-@dirrmtry share/locale/dz/LC_MESSAGES
-@dirrmtry share/locale/dz
-@dirrmtry share/locale/bn_IN/LC_MESSAGES
-@dirrmtry share/locale/bn_IN
-@dirrmtry share/locale/be@latin/LC_MESSAGES
-@dirrmtry share/locale/be@latin
diff --git a/sysutils/gnome-system-tools/Makefile b/sysutils/gnome-system-tools/Makefile
deleted file mode 100644
index de231ff57..000000000
--- a/sysutils/gnome-system-tools/Makefile
+++ /dev/null
@@ -1,36 +0,0 @@
-# New ports collection makefile for:	gnomesystemtools
-# Date created:				17 May 2004
-# Whom:					Adam Weinberger <adamw@FreeBSD.org>
-#
-# $FreeBSD$
-#   $MCom: ports/sysutils/gnome-system-tools/Makefile,v 1.77 2008/02/26 01:10:27 mezz Exp $
-#
-
-PORTNAME=	gnome-system-tools
-PORTVERSION=	2.22.0
-CATEGORIES=	sysutils gnome
-MASTER_SITES=	GNOME
-DIST_SUBDIR=	gnome2
-
-MAINTAINER=	gnome@FreeBSD.org
-COMMENT=	Tools to configure workstations
-
-LIB_DEPENDS=	oobs-1.4:${PORTSDIR}/devel/liboobs
-
-USE_BZIP2=	yes
-USE_GMAKE=	yes
-INSTALLS_ICONS=	yes
-USE_GETTEXT=	yes
-USE_LDCONFIG=	yes
-USE_XLIB=	yes
-GNOME_DESKTOP_VERSION=2
-USE_GNOME=	gnomehack gnomeprefix gnometarget intlhack nautilus2
-USE_AUTOTOOLS=	libtool:15
-INSTALLS_OMF=	yes
-CONFIGURE_ARGS=	--enable-services
-CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" \
-		LDFLAGS="-L${LOCALBASE}/lib"
-
-GCONF_SCHEMAS=	gnome-system-tools.schemas
-
-.include <bsd.port.mk>
diff --git a/sysutils/gnome-system-tools/distinfo b/sysutils/gnome-system-tools/distinfo
deleted file mode 100644
index c56c52fb6..000000000
--- a/sysutils/gnome-system-tools/distinfo
+++ /dev/null
@@ -1,3 +0,0 @@
-MD5 (gnome2/gnome-system-tools-2.22.0.tar.bz2) = 6559bb97fc75bc28b559dc530571d527
-SHA256 (gnome2/gnome-system-tools-2.22.0.tar.bz2) = 57c348458efdf34118bc46102e2389cf32172f22e3429bb959a81a773ade56b9
-SIZE (gnome2/gnome-system-tools-2.22.0.tar.bz2) = 3441541
diff --git a/sysutils/gnome-system-tools/files/patch-src_users_user-settings.c b/sysutils/gnome-system-tools/files/patch-src_users_user-settings.c
deleted file mode 100644
index c19a384a9..000000000
--- a/sysutils/gnome-system-tools/files/patch-src_users_user-settings.c
+++ /dev/null
@@ -1,15 +0,0 @@
---- src/users/user-settings.c.orig	Sun Apr 22 23:32:58 2007
-+++ src/users/user-settings.c	Sun Apr 22 23:34:18 2007
-@@ -632,10 +632,10 @@
- 		password_changed = GPOINTER_TO_INT (g_object_get_data (G_OBJECT (widget), "changed"));
- 
- 		if (password_changed)
--			oobs_user_set_password (user, gtk_entry_get_text (GTK_ENTRY (widget)));
-+			oobs_user_set_crypted_password (user, gtk_entry_get_text (GTK_ENTRY (widget)));
- 	} else {
- 		widget = gst_dialog_get_widget (tool->main_dialog, "user_settings_random_passwd");
--		oobs_user_set_password (user, gtk_entry_get_text (GTK_ENTRY (widget)));
-+		oobs_user_set_crypted_password (user, gtk_entry_get_text (GTK_ENTRY (widget)));
- 	}
- 
- 	group = get_main_group (oobs_user_get_login_name (user));
diff --git a/sysutils/gnome-system-tools/pkg-descr b/sysutils/gnome-system-tools/pkg-descr
deleted file mode 100644
index b0b69e539..000000000
--- a/sysutils/gnome-system-tools/pkg-descr
+++ /dev/null
@@ -1,10 +0,0 @@
-Various tools to assist in administration and configuration of a workstation.
-Included are tools to:
-
-	* Administer user and group accounts
-	* Change the date, time, and time zone
-	* Set up and configure network interfaces
-	* Modify bootloader settings
-	* Start, stop, and modify system services
-
-WWW: http://www.gnome.org/projects/gst/
diff --git a/sysutils/gnome-system-tools/pkg-plist b/sysutils/gnome-system-tools/pkg-plist
deleted file mode 100644
index 3d2ede748..000000000
--- a/sysutils/gnome-system-tools/pkg-plist
+++ /dev/null
@@ -1,351 +0,0 @@
-bin/network-admin
-bin/services-admin
-bin/shares-admin
-bin/time-admin
-bin/users-admin
-lib/nautilus/extensions-2.0/libnautilus-gst-shares.a
-lib/nautilus/extensions-2.0/libnautilus-gst-shares.la
-lib/nautilus/extensions-2.0/libnautilus-gst-shares.so
-libdata/pkgconfig/gnome-system-tools.pc
-share/applications/network.desktop
-share/applications/services.desktop
-share/applications/shares.desktop
-share/applications/time.desktop
-share/applications/users.desktop
-%%DATADIR%%/pixmaps/world_map-960.png
-%%DATADIR%%/ui/common.ui
-%%DATADIR%%/ui/network.ui
-%%DATADIR%%/ui/services.ui
-%%DATADIR%%/ui/shares.ui
-%%DATADIR%%/ui/time.ui
-%%DATADIR%%/ui/users.ui
-share/gnome/help/network-admin/C/figures/network-tool.png
-share/gnome/help/network-admin/C/legal.xml
-share/gnome/help/network-admin/C/network-admin.xml
-share/gnome/help/network-admin/ca/figures/network-tool.png
-share/gnome/help/network-admin/ca/network-admin.xml
-share/gnome/help/network-admin/es/figures/network-tool.png
-share/gnome/help/network-admin/es/network-admin.xml
-share/gnome/help/network-admin/fr/figures/network-tool.png
-share/gnome/help/network-admin/fr/network-admin.xml
-share/gnome/help/network-admin/oc/figures/network-tool.png
-share/gnome/help/network-admin/oc/network-admin.xml
-share/gnome/help/network-admin/sv/figures/network-tool.png
-share/gnome/help/network-admin/sv/network-admin.xml
-share/gnome/help/services-admin/C/figures/services-tool.png
-share/gnome/help/services-admin/C/legal.xml
-share/gnome/help/services-admin/C/services-admin.xml
-share/gnome/help/services-admin/ca/figures/services-tool.png
-share/gnome/help/services-admin/ca/services-admin.xml
-share/gnome/help/services-admin/el/figures/services-tool.png
-share/gnome/help/services-admin/el/services-admin.xml
-share/gnome/help/services-admin/es/figures/services-tool.png
-share/gnome/help/services-admin/es/services-admin.xml
-share/gnome/help/services-admin/fr/figures/services-tool.png
-share/gnome/help/services-admin/fr/services-admin.xml
-share/gnome/help/services-admin/nl/figures/service-properties.png
-share/gnome/help/services-admin/nl/figures/services-tool.png
-share/gnome/help/services-admin/nl/legal.xml
-share/gnome/help/services-admin/nl/services-admin.xml
-share/gnome/help/services-admin/oc/figures/services-tool.png
-share/gnome/help/services-admin/oc/services-admin.xml
-share/gnome/help/services-admin/sv/figures/services-tool.png
-share/gnome/help/services-admin/sv/services-admin.xml
-share/gnome/help/shares-admin/C/figures/shares-tool.png
-share/gnome/help/shares-admin/C/legal.xml
-share/gnome/help/shares-admin/C/shares-admin.xml
-share/gnome/help/shares-admin/ca/figures/shares-tool.png
-share/gnome/help/shares-admin/ca/shares-admin.xml
-share/gnome/help/shares-admin/es/figures/shares-tool.png
-share/gnome/help/shares-admin/es/shares-admin.xml
-share/gnome/help/shares-admin/fr/figures/shares-tool.png
-share/gnome/help/shares-admin/fr/shares-admin.xml
-share/gnome/help/shares-admin/oc/figures/shares-tool.png
-share/gnome/help/shares-admin/oc/shares-admin.xml
-share/gnome/help/shares-admin/sv/figures/shares-tool.png
-share/gnome/help/shares-admin/sv/shares-admin.xml
-share/gnome/help/time-admin/C/figures/time-map.png
-share/gnome/help/time-admin/C/figures/time-servers.png
-share/gnome/help/time-admin/C/figures/time-tool-automatic.png
-share/gnome/help/time-admin/C/figures/time-tool-manual.png
-share/gnome/help/time-admin/C/legal.xml
-share/gnome/help/time-admin/C/time-admin.xml
-share/gnome/help/time-admin/ca/figures/time-map.png
-share/gnome/help/time-admin/ca/figures/time-servers.png
-share/gnome/help/time-admin/ca/figures/time-tool-automatic.png
-share/gnome/help/time-admin/ca/figures/time-tool-manual.png
-share/gnome/help/time-admin/ca/time-admin.xml
-share/gnome/help/time-admin/es/figures/time-map.png
-share/gnome/help/time-admin/es/figures/time-servers.png
-share/gnome/help/time-admin/es/figures/time-tool-automatic.png
-share/gnome/help/time-admin/es/figures/time-tool-manual.png
-share/gnome/help/time-admin/es/time-admin.xml
-share/gnome/help/time-admin/fr/figures/time-map.png
-share/gnome/help/time-admin/fr/figures/time-servers.png
-share/gnome/help/time-admin/fr/figures/time-tool-automatic.png
-share/gnome/help/time-admin/fr/figures/time-tool-manual.png
-share/gnome/help/time-admin/fr/time-admin.xml
-share/gnome/help/time-admin/nl/figures/time-map.png
-share/gnome/help/time-admin/nl/figures/time-servers.png
-share/gnome/help/time-admin/nl/figures/time-tool-manual.png
-share/gnome/help/time-admin/nl/legal.xml
-share/gnome/help/time-admin/nl/time-admin.xml
-share/gnome/help/time-admin/oc/figures/time-map.png
-share/gnome/help/time-admin/oc/figures/time-servers.png
-share/gnome/help/time-admin/oc/figures/time-tool-automatic.png
-share/gnome/help/time-admin/oc/figures/time-tool-manual.png
-share/gnome/help/time-admin/oc/time-admin.xml
-share/gnome/help/time-admin/ru/figures/time-map.png
-share/gnome/help/time-admin/ru/figures/time-servers.png
-share/gnome/help/time-admin/ru/figures/time-tool-automatic.png
-share/gnome/help/time-admin/ru/figures/time-tool-manual.png
-share/gnome/help/time-admin/ru/time-admin.xml
-share/gnome/help/time-admin/sv/figures/time-map.png
-share/gnome/help/time-admin/sv/figures/time-servers.png
-share/gnome/help/time-admin/sv/figures/time-tool-automatic.png
-share/gnome/help/time-admin/sv/figures/time-tool-manual.png
-share/gnome/help/time-admin/sv/time-admin.xml
-share/gnome/help/users-admin/C/figures/users-tool.png
-share/gnome/help/users-admin/C/legal.xml
-share/gnome/help/users-admin/C/users-admin.xml
-share/gnome/help/users-admin/ca/figures/users-tool.png
-share/gnome/help/users-admin/ca/users-admin.xml
-share/gnome/help/users-admin/el/figures/users-tool.png
-share/gnome/help/users-admin/el/users-admin.xml
-share/gnome/help/users-admin/es/figures/users-tool.png
-share/gnome/help/users-admin/es/users-admin.xml
-share/gnome/help/users-admin/fr/figures/users-tool.png
-share/gnome/help/users-admin/fr/users-admin.xml
-share/gnome/help/users-admin/oc/figures/users-tool.png
-share/gnome/help/users-admin/oc/users-admin.xml
-share/gnome/help/users-admin/ru/figures/users-tool.png
-share/gnome/help/users-admin/ru/users-admin.xml
-share/gnome/help/users-admin/sv/figures/users-tool.png
-share/gnome/help/users-admin/sv/users-admin.xml
-share/icons/hicolor/16x16/apps/time-admin.png
-share/icons/hicolor/22x22/apps/time-admin.png
-share/icons/hicolor/24x24/apps/time-admin.png
-share/icons/hicolor/32x32/apps/time-admin.png
-share/icons/hicolor/48x48/apps/time-admin.png
-share/icons/hicolor/48x48/devices/irda.png
-share/icons/hicolor/48x48/devices/plip.png
-share/icons/hicolor/scalable/apps/time-admin.svg
-share/locale/am/LC_MESSAGES/gnome-system-tools.mo
-share/locale/ar/LC_MESSAGES/gnome-system-tools.mo
-share/locale/az/LC_MESSAGES/gnome-system-tools.mo
-share/locale/be/LC_MESSAGES/gnome-system-tools.mo
-share/locale/be@latin/LC_MESSAGES/gnome-system-tools.mo
-share/locale/bg/LC_MESSAGES/gnome-system-tools.mo
-share/locale/bn/LC_MESSAGES/gnome-system-tools.mo
-share/locale/bn_IN/LC_MESSAGES/gnome-system-tools.mo
-share/locale/ca/LC_MESSAGES/gnome-system-tools.mo
-share/locale/cs/LC_MESSAGES/gnome-system-tools.mo
-share/locale/cy/LC_MESSAGES/gnome-system-tools.mo
-share/locale/da/LC_MESSAGES/gnome-system-tools.mo
-share/locale/de/LC_MESSAGES/gnome-system-tools.mo
-share/locale/dz/LC_MESSAGES/gnome-system-tools.mo
-share/locale/el/LC_MESSAGES/gnome-system-tools.mo
-share/locale/en_CA/LC_MESSAGES/gnome-system-tools.mo
-share/locale/en_GB/LC_MESSAGES/gnome-system-tools.mo
-share/locale/es/LC_MESSAGES/gnome-system-tools.mo
-share/locale/et/LC_MESSAGES/gnome-system-tools.mo
-share/locale/eu/LC_MESSAGES/gnome-system-tools.mo
-share/locale/fa/LC_MESSAGES/gnome-system-tools.mo
-share/locale/fi/LC_MESSAGES/gnome-system-tools.mo
-share/locale/fr/LC_MESSAGES/gnome-system-tools.mo
-share/locale/ga/LC_MESSAGES/gnome-system-tools.mo
-share/locale/gl/LC_MESSAGES/gnome-system-tools.mo
-share/locale/gu/LC_MESSAGES/gnome-system-tools.mo
-share/locale/he/LC_MESSAGES/gnome-system-tools.mo
-share/locale/hi/LC_MESSAGES/gnome-system-tools.mo
-share/locale/hr/LC_MESSAGES/gnome-system-tools.mo
-share/locale/hu/LC_MESSAGES/gnome-system-tools.mo
-share/locale/id/LC_MESSAGES/gnome-system-tools.mo
-share/locale/it/LC_MESSAGES/gnome-system-tools.mo
-share/locale/ja/LC_MESSAGES/gnome-system-tools.mo
-share/locale/ka/LC_MESSAGES/gnome-system-tools.mo
-share/locale/ko/LC_MESSAGES/gnome-system-tools.mo
-share/locale/ku/LC_MESSAGES/gnome-system-tools.mo
-share/locale/lt/LC_MESSAGES/gnome-system-tools.mo
-share/locale/lv/LC_MESSAGES/gnome-system-tools.mo
-share/locale/mg/LC_MESSAGES/gnome-system-tools.mo
-share/locale/mk/LC_MESSAGES/gnome-system-tools.mo
-share/locale/ml/LC_MESSAGES/gnome-system-tools.mo
-share/locale/mn/LC_MESSAGES/gnome-system-tools.mo
-share/locale/mr/LC_MESSAGES/gnome-system-tools.mo
-share/locale/ms/LC_MESSAGES/gnome-system-tools.mo
-share/locale/nb/LC_MESSAGES/gnome-system-tools.mo
-share/locale/ne/LC_MESSAGES/gnome-system-tools.mo
-share/locale/nl/LC_MESSAGES/gnome-system-tools.mo
-share/locale/nn/LC_MESSAGES/gnome-system-tools.mo
-share/locale/oc/LC_MESSAGES/gnome-system-tools.mo
-share/locale/or/LC_MESSAGES/gnome-system-tools.mo
-share/locale/pa/LC_MESSAGES/gnome-system-tools.mo
-share/locale/pl/LC_MESSAGES/gnome-system-tools.mo
-share/locale/pt/LC_MESSAGES/gnome-system-tools.mo
-share/locale/pt_BR/LC_MESSAGES/gnome-system-tools.mo
-share/locale/ro/LC_MESSAGES/gnome-system-tools.mo
-share/locale/ru/LC_MESSAGES/gnome-system-tools.mo
-share/locale/rw/LC_MESSAGES/gnome-system-tools.mo
-share/locale/si/LC_MESSAGES/gnome-system-tools.mo
-share/locale/sk/LC_MESSAGES/gnome-system-tools.mo
-share/locale/sl/LC_MESSAGES/gnome-system-tools.mo
-share/locale/sq/LC_MESSAGES/gnome-system-tools.mo
-share/locale/sr/LC_MESSAGES/gnome-system-tools.mo
-share/locale/sr@Latn/LC_MESSAGES/gnome-system-tools.mo
-share/locale/sv/LC_MESSAGES/gnome-system-tools.mo
-share/locale/ta/LC_MESSAGES/gnome-system-tools.mo
-share/locale/th/LC_MESSAGES/gnome-system-tools.mo
-share/locale/tr/LC_MESSAGES/gnome-system-tools.mo
-share/locale/uk/LC_MESSAGES/gnome-system-tools.mo
-share/locale/vi/LC_MESSAGES/gnome-system-tools.mo
-share/locale/wa/LC_MESSAGES/gnome-system-tools.mo
-share/locale/xh/LC_MESSAGES/gnome-system-tools.mo
-share/locale/zh_CN/LC_MESSAGES/gnome-system-tools.mo
-share/locale/zh_HK/LC_MESSAGES/gnome-system-tools.mo
-share/locale/zh_TW/LC_MESSAGES/gnome-system-tools.mo
-share/omf/gnome-system-tools/services-admin-nl.omf
-share/omf/gnome-system-tools/time-admin-nl.omf
-share/omf/network-admin/network-admin-C.omf
-share/omf/network-admin/network-admin-ca.omf
-share/omf/network-admin/network-admin-es.omf
-share/omf/network-admin/network-admin-fr.omf
-share/omf/network-admin/network-admin-oc.omf
-share/omf/network-admin/network-admin-sv.omf
-share/omf/services-admin/services-admin-C.omf
-share/omf/services-admin/services-admin-ca.omf
-share/omf/services-admin/services-admin-el.omf
-share/omf/services-admin/services-admin-es.omf
-share/omf/services-admin/services-admin-fr.omf
-share/omf/services-admin/services-admin-oc.omf
-share/omf/services-admin/services-admin-sv.omf
-share/omf/shares-admin/shares-admin-C.omf
-share/omf/shares-admin/shares-admin-ca.omf
-share/omf/shares-admin/shares-admin-es.omf
-share/omf/shares-admin/shares-admin-fr.omf
-share/omf/shares-admin/shares-admin-oc.omf
-share/omf/shares-admin/shares-admin-sv.omf
-share/omf/time-admin/time-admin-C.omf
-share/omf/time-admin/time-admin-ca.omf
-share/omf/time-admin/time-admin-es.omf
-share/omf/time-admin/time-admin-fr.omf
-share/omf/time-admin/time-admin-oc.omf
-share/omf/time-admin/time-admin-ru.omf
-share/omf/time-admin/time-admin-sv.omf
-share/omf/users-admin/users-admin-C.omf
-share/omf/users-admin/users-admin-ca.omf
-share/omf/users-admin/users-admin-el.omf
-share/omf/users-admin/users-admin-es.omf
-share/omf/users-admin/users-admin-fr.omf
-share/omf/users-admin/users-admin-oc.omf
-share/omf/users-admin/users-admin-ru.omf
-share/omf/users-admin/users-admin-sv.omf
-@dirrm share/omf/users-admin
-@dirrm share/omf/time-admin
-@dirrm share/omf/shares-admin
-@dirrm share/omf/services-admin
-@dirrm share/omf/network-admin
-@dirrm share/omf/gnome-system-tools
-@dirrm share/gnome/help/users-admin/sv/figures
-@dirrm share/gnome/help/users-admin/sv
-@dirrm share/gnome/help/users-admin/ru/figures
-@dirrm share/gnome/help/users-admin/ru
-@dirrm share/gnome/help/users-admin/oc/figures
-@dirrm share/gnome/help/users-admin/oc
-@dirrm share/gnome/help/users-admin/fr/figures
-@dirrm share/gnome/help/users-admin/fr
-@dirrm share/gnome/help/users-admin/es/figures
-@dirrm share/gnome/help/users-admin/es
-@dirrm share/gnome/help/users-admin/el/figures
-@dirrm share/gnome/help/users-admin/el
-@dirrm share/gnome/help/users-admin/ca/figures
-@dirrm share/gnome/help/users-admin/ca
-@dirrm share/gnome/help/users-admin/C/figures
-@dirrm share/gnome/help/users-admin/C
-@dirrm share/gnome/help/users-admin
-@dirrm share/gnome/help/time-admin/sv/figures
-@dirrm share/gnome/help/time-admin/sv
-@dirrm share/gnome/help/time-admin/ru/figures
-@dirrm share/gnome/help/time-admin/ru
-@dirrm share/gnome/help/time-admin/oc/figures
-@dirrm share/gnome/help/time-admin/oc
-@dirrm share/gnome/help/time-admin/nl/figures
-@dirrm share/gnome/help/time-admin/nl
-@dirrm share/gnome/help/time-admin/fr/figures
-@dirrm share/gnome/help/time-admin/fr
-@dirrm share/gnome/help/time-admin/es/figures
-@dirrm share/gnome/help/time-admin/es
-@dirrm share/gnome/help/time-admin/ca/figures
-@dirrm share/gnome/help/time-admin/ca
-@dirrm share/gnome/help/time-admin/C/figures
-@dirrm share/gnome/help/time-admin/C
-@dirrm share/gnome/help/time-admin
-@dirrm share/gnome/help/shares-admin/sv/figures
-@dirrm share/gnome/help/shares-admin/sv
-@dirrm share/gnome/help/shares-admin/oc/figures
-@dirrm share/gnome/help/shares-admin/oc
-@dirrm share/gnome/help/shares-admin/fr/figures
-@dirrm share/gnome/help/shares-admin/fr
-@dirrm share/gnome/help/shares-admin/es/figures
-@dirrm share/gnome/help/shares-admin/es
-@dirrm share/gnome/help/shares-admin/ca/figures
-@dirrm share/gnome/help/shares-admin/ca
-@dirrm share/gnome/help/shares-admin/C/figures
-@dirrm share/gnome/help/shares-admin/C
-@dirrm share/gnome/help/shares-admin
-@dirrm share/gnome/help/services-admin/sv/figures
-@dirrm share/gnome/help/services-admin/sv
-@dirrm share/gnome/help/services-admin/oc/figures
-@dirrm share/gnome/help/services-admin/oc
-@dirrm share/gnome/help/services-admin/nl/figures
-@dirrm share/gnome/help/services-admin/nl
-@dirrm share/gnome/help/services-admin/fr/figures
-@dirrm share/gnome/help/services-admin/fr
-@dirrm share/gnome/help/services-admin/es/figures
-@dirrm share/gnome/help/services-admin/es
-@dirrm share/gnome/help/services-admin/el/figures
-@dirrm share/gnome/help/services-admin/el
-@dirrm share/gnome/help/services-admin/ca/figures
-@dirrm share/gnome/help/services-admin/ca
-@dirrm share/gnome/help/services-admin/C/figures
-@dirrm share/gnome/help/services-admin/C
-@dirrm share/gnome/help/services-admin
-@dirrm share/gnome/help/network-admin/sv/figures
-@dirrm share/gnome/help/network-admin/sv
-@dirrm share/gnome/help/network-admin/oc/figures
-@dirrm share/gnome/help/network-admin/oc
-@dirrm share/gnome/help/network-admin/fr/figures
-@dirrm share/gnome/help/network-admin/fr
-@dirrm share/gnome/help/network-admin/es/figures
-@dirrm share/gnome/help/network-admin/es
-@dirrm share/gnome/help/network-admin/ca/figures
-@dirrm share/gnome/help/network-admin/ca
-@dirrm share/gnome/help/network-admin/C/figures
-@dirrm share/gnome/help/network-admin/C
-@dirrm share/gnome/help/network-admin
-@dirrm %%DATADIR%%/ui
-@dirrm %%DATADIR%%/pixmaps
-@dirrm %%DATADIR%%
-@dirrmtry share/applications
-@dirrmtry share/locale/zh_HK/LC_MESSAGES
-@dirrmtry share/locale/zh_HK
-@dirrmtry share/locale/xh/LC_MESSAGES
-@dirrmtry share/locale/xh
-@dirrmtry share/locale/si/LC_MESSAGES
-@dirrmtry share/locale/si
-@dirrmtry share/locale/rw/LC_MESSAGES
-@dirrmtry share/locale/rw
-@dirrmtry share/locale/oc/LC_MESSAGES
-@dirrmtry share/locale/oc
-@dirrmtry share/locale/mr/LC_MESSAGES
-@dirrmtry share/locale/mr
-@dirrmtry share/locale/mg/LC_MESSAGES
-@dirrmtry share/locale/mg
-@dirrmtry share/locale/ku/LC_MESSAGES
-@dirrmtry share/locale/ku
-@dirrmtry share/locale/dz/LC_MESSAGES
-@dirrmtry share/locale/dz
-@dirrmtry share/locale/bn_IN/LC_MESSAGES
-@dirrmtry share/locale/bn_IN
-@dirrmtry share/locale/be@latin/LC_MESSAGES
-@dirrmtry share/locale/be@latin
diff --git a/sysutils/gnome-volume-manager/Makefile b/sysutils/gnome-volume-manager/Makefile
deleted file mode 100644
index 7f49f247e..000000000
--- a/sysutils/gnome-volume-manager/Makefile
+++ /dev/null
@@ -1,32 +0,0 @@
-# New ports collection makefile for:	gnome-volume-manager
-# Date created:			02 May 2006
-# Whom:				Jean-Yves Lefort <jylefort@FreeBSD.org>
-#
-# $FreeBSD$
-#   $MCom: ports/sysutils/gnome-volume-manager/Makefile,v 1.23 2008/02/02 04:21:11 marcus Exp $
-#
-
-PORTNAME=	gnome-volume-manager
-PORTVERSION=	2.22.1
-PORTREVISION=	3
-CATEGORIES=	sysutils gnome
-MASTER_SITES=	${MASTER_SITE_GNOME}
-MASTER_SITE_SUBDIR=	sources/${PORTNAME}/${PORTVERSION:R}
-
-MAINTAINER=	gnome@FreeBSD.org
-COMMENT=	Automatically mount removable media, and more
-
-LIB_DEPENDS=	hal.1:${PORTSDIR}/sysutils/hal \
-		notify.1:${PORTSDIR}/devel/libnotify
-
-USE_XLIB=	yes
-USE_BZIP2=	yes
-USE_GNOME=	gnomeprefix gnomehack intlhack nautilus2
-USE_GMAKE=	yes
-USE_GETTEXT=	yes
-GNU_CONFIGURE=	yes
-CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" LDFLAGS="-L${LOCALBASE}/lib"
-CONFIGURE_ARGS=	--disable-multiuser
-GCONF_SCHEMAS=	gnome-volume-manager.schemas
-
-.include <bsd.port.mk>
diff --git a/sysutils/gnome-volume-manager/distinfo b/sysutils/gnome-volume-manager/distinfo
deleted file mode 100644
index 29774bf19..000000000
--- a/sysutils/gnome-volume-manager/distinfo
+++ /dev/null
@@ -1,3 +0,0 @@
-MD5 (gnome-volume-manager-2.22.1.tar.bz2) = a0cb86f541515f33443c848879d04785
-SHA256 (gnome-volume-manager-2.22.1.tar.bz2) = 8305428940e3aab9a7c6ccaa283489170d8de96b873695b541c8a7daacd2d591
-SIZE (gnome-volume-manager-2.22.1.tar.bz2) = 361668
diff --git a/sysutils/gnome-volume-manager/files/patch-00_disable_media_handling b/sysutils/gnome-volume-manager/files/patch-00_disable_media_handling
deleted file mode 100644
index 9abff24dc..000000000
--- a/sysutils/gnome-volume-manager/files/patch-00_disable_media_handling
+++ /dev/null
@@ -1,1460 +0,0 @@
-# Description: Disable media handling and the respective UI tabs, since nautilus does that now.
-# Upstream: http://bugzilla.gnome.org/show_bug.cgi?id=509823
---- gnome-volume-manager-2.22.1/gnome-volume-manager.schemas.in	2007-12-07 18:55:47.000000000 +0100
-+++ gnome-volume-manager.schemas.in	2008-02-29 16:30:08.000000000 +0100
-@@ -16,7 +16,7 @@
-         <key>/schemas/desktop/gnome/volume_manager/automount_drives</key>
-         <applyto>/desktop/gnome/volume_manager/automount_drives</applyto>
-         <type>bool</type>
--        <default>true</default>
-+        <default>false</default>
-         <locale name="C">
-           <short>Automount removable drives</short>
-           <long>Whether gnome-volume-manager should automatically mount
-@@ -28,7 +28,7 @@
-         <key>/schemas/desktop/gnome/volume_manager/automount_media</key>
-         <applyto>/desktop/gnome/volume_manager/automount_media</applyto>
-         <type>bool</type>
--        <default>true</default>
-+        <default>false</default>
-         <locale name="C">
-           <short>Automount removable media</short>
-           <long>Whether gnome-volume-manager should automatically mount
-@@ -40,7 +40,7 @@
-         <key>/schemas/desktop/gnome/volume_manager/autobrowse</key>
-         <applyto>/desktop/gnome/volume_manager/autobrowse</applyto>
-         <type>bool</type>
--        <default>true</default>
-+        <default>false</default>
-         <locale name="C">
-           <short>Autorun nautilus</short>
-           <long>Open nautilus on removeable media insert.</long>
-@@ -97,7 +97,7 @@
-         <key>/schemas/desktop/gnome/volume_manager/autoplay_cda</key>
- 	<applyto>/desktop/gnome/volume_manager/autoplay_cda</applyto>
- 	<type>bool</type>
--	<default>true</default>
-+	<default>false</default>
- 	<locale name="C">
- 	  <short>Play inserted audio CD's</short>
- 	  <long>Whether, when an audio CD is inserted, gnome-volume-manager
-@@ -154,7 +154,7 @@
-         <key>/schemas/desktop/gnome/volume_manager/autoplay_dvd</key>
- 	<applyto>/desktop/gnome/volume_manager/autoplay_dvd</applyto>
- 	<type>bool</type>
--	<default>true</default>
-+	<default>false</default>
- 	<locale name="C">
- 	  <short>Play inserted video DVDs</short>
- 	  <long>Whether, when a video DVD is inserted,
-@@ -177,7 +177,7 @@
-         <key>/schemas/desktop/gnome/volume_manager/autoplay_vcd</key>
- 	<applyto>/desktop/gnome/volume_manager/autoplay_vcd</applyto>
- 	<type>bool</type>
--	<default>true</default>
-+	<default>false</default>
- 	<locale name="C">
- 	  <short>Play inserted video VCDs</short>
- 	  <long>Whether, when a video VCD is inserted,
-@@ -248,7 +248,7 @@
-         <key>/schemas/desktop/gnome/volume_manager/autoprinter</key>
- 	<applyto>/desktop/gnome/volume_manager/autoprinter</applyto>
- 	<type>bool</type>
--	<default>true</default>
-+	<default>false</default>
- 	<locale name="C">
- 	  <short>Run printer program</short>
- 	  <long>Whether, when a printer is connected, gnome-volume-manager should run
-diff -Nur -x '*.orig' -x '*~' gnome-volume-manager-2.22.1/gnome-volume-properties.glade gnome-volume-manager-2.22.1.new/gnome-volume-properties.glade
---- gnome-volume-manager-2.22.1/gnome-volume-properties.glade	2007-12-07 18:55:47.000000000 +0100
-+++ gnome-volume-properties.glade	2008-02-29 16:30:08.000000000 +0100
-@@ -68,1197 +68,6 @@
- 	  <property name="enable_popup">False</property>
- 
- 	  <child>
--	    <widget class="GtkVBox" id="storage_vbox">
--	      <property name="border_width">12</property>
--	      <property name="visible">True</property>
--	      <property name="homogeneous">False</property>
--	      <property name="spacing">18</property>
--
--	      <child>
--		<widget class="GtkVBox" id="removable_drives_vbox">
--		  <property name="visible">True</property>
--		  <property name="homogeneous">False</property>
--		  <property name="spacing">6</property>
--
--		  <child>
--		    <widget class="GtkLabel" id="removable_drives_label">
--		      <property name="visible">True</property>
--		      <property name="label" translatable="yes">&lt;b&gt;Removable Storage&lt;/b&gt;</property>
--		      <property name="use_underline">False</property>
--		      <property name="use_markup">True</property>
--		      <property name="justify">GTK_JUSTIFY_LEFT</property>
--		      <property name="wrap">False</property>
--		      <property name="selectable">False</property>
--		      <property name="xalign">0</property>
--		      <property name="yalign">0.5</property>
--		      <property name="xpad">0</property>
--		      <property name="ypad">0</property>
--		      <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property>
--		      <property name="width_chars">-1</property>
--		      <property name="single_line_mode">False</property>
--		      <property name="angle">0</property>
--		    </widget>
--		    <packing>
--		      <property name="padding">0</property>
--		      <property name="expand">False</property>
--		      <property name="fill">False</property>
--		    </packing>
--		  </child>
--
--		  <child>
--		    <widget class="GtkHBox" id="removable_drives_hbox">
--		      <property name="visible">True</property>
--		      <property name="homogeneous">False</property>
--		      <property name="spacing">12</property>
--
--		      <child>
--			<widget class="GtkImage" id="removable_drives_image">
--			  <property name="visible">True</property>
--			  <property name="xalign">0.5</property>
--			  <property name="yalign">0</property>
--			  <property name="xpad">0</property>
--			  <property name="ypad">0</property>
--			</widget>
--			<packing>
--			  <property name="padding">0</property>
--			  <property name="expand">False</property>
--			  <property name="fill">False</property>
--			</packing>
--		      </child>
--
--		      <child>
--			<widget class="GtkVBox" id="removable_drives_options_vbox">
--			  <property name="visible">True</property>
--			  <property name="homogeneous">False</property>
--			  <property name="spacing">6</property>
--
--			  <child>
--			    <widget class="GtkCheckButton" id="automount_drives">
--			      <property name="visible">True</property>
--			      <property name="can_focus">True</property>
--			      <property name="label" translatable="yes">_Mount removable drives when hot-plugged</property>
--			      <property name="use_underline">True</property>
--			      <property name="relief">GTK_RELIEF_NORMAL</property>
--			      <property name="focus_on_click">True</property>
--			      <property name="active">False</property>
--			      <property name="inconsistent">False</property>
--			      <property name="draw_indicator">True</property>
--			    </widget>
--			    <packing>
--			      <property name="padding">0</property>
--			      <property name="expand">False</property>
--			      <property name="fill">False</property>
--			    </packing>
--			  </child>
--
--			  <child>
--			    <widget class="GtkCheckButton" id="automount_media">
--			      <property name="visible">True</property>
--			      <property name="can_focus">True</property>
--			      <property name="label" translatable="yes">Mount removable media when _inserted</property>
--			      <property name="use_underline">True</property>
--			      <property name="relief">GTK_RELIEF_NORMAL</property>
--			      <property name="focus_on_click">True</property>
--			      <property name="active">False</property>
--			      <property name="inconsistent">False</property>
--			      <property name="draw_indicator">True</property>
--			    </widget>
--			    <packing>
--			      <property name="padding">0</property>
--			      <property name="expand">False</property>
--			      <property name="fill">False</property>
--			    </packing>
--			  </child>
--
--			  <child>
--			    <widget class="GtkCheckButton" id="autobrowse">
--			      <property name="visible">True</property>
--			      <property name="can_focus">True</property>
--			      <property name="label" translatable="yes">Browse _removable media when inserted</property>
--			      <property name="use_underline">True</property>
--			      <property name="relief">GTK_RELIEF_NORMAL</property>
--			      <property name="focus_on_click">True</property>
--			      <property name="active">False</property>
--			      <property name="inconsistent">False</property>
--			      <property name="draw_indicator">True</property>
--			    </widget>
--			    <packing>
--			      <property name="padding">0</property>
--			      <property name="expand">False</property>
--			      <property name="fill">False</property>
--			    </packing>
--			  </child>
--
--			  <child>
--			    <widget class="GtkCheckButton" id="autorun">
--			      <property name="visible">True</property>
--			      <property name="can_focus">True</property>
--			      <property name="label" translatable="yes">_Auto-run programs on new drives and media</property>
--			      <property name="use_underline">True</property>
--			      <property name="relief">GTK_RELIEF_NORMAL</property>
--			      <property name="focus_on_click">True</property>
--			      <property name="active">False</property>
--			      <property name="inconsistent">False</property>
--			      <property name="draw_indicator">True</property>
--			    </widget>
--			    <packing>
--			      <property name="padding">0</property>
--			      <property name="expand">False</property>
--			      <property name="fill">False</property>
--			    </packing>
--			  </child>
--
--			  <child>
--			    <widget class="GtkCheckButton" id="autoopen">
--			      <property name="visible">True</property>
--			      <property name="can_focus">True</property>
--			      <property name="label" translatable="yes">Auto-_open files on new drives and media</property>
--			      <property name="use_underline">True</property>
--			      <property name="relief">GTK_RELIEF_NORMAL</property>
--			      <property name="focus_on_click">True</property>
--			      <property name="active">False</property>
--			      <property name="inconsistent">False</property>
--			      <property name="draw_indicator">True</property>
--			    </widget>
--			    <packing>
--			      <property name="padding">0</property>
--			      <property name="expand">False</property>
--			      <property name="fill">False</property>
--			    </packing>
--			  </child>
--			</widget>
--			<packing>
--			  <property name="padding">0</property>
--			  <property name="expand">True</property>
--			  <property name="fill">True</property>
--			</packing>
--		      </child>
--		    </widget>
--		    <packing>
--		      <property name="padding">0</property>
--		      <property name="expand">True</property>
--		      <property name="fill">True</property>
--		    </packing>
--		  </child>
--		</widget>
--		<packing>
--		  <property name="padding">0</property>
--		  <property name="expand">False</property>
--		  <property name="fill">True</property>
--		</packing>
--	      </child>
--
--	      <child>
--		<widget class="GtkVBox" id="blank_cd_vbox">
--		  <property name="visible">True</property>
--		  <property name="homogeneous">False</property>
--		  <property name="spacing">6</property>
--
--		  <child>
--		    <widget class="GtkLabel" id="blank_cd_label">
--		      <property name="visible">True</property>
--		      <property name="label" translatable="yes">&lt;b&gt;Blank CD and DVD Discs&lt;/b&gt;</property>
--		      <property name="use_underline">False</property>
--		      <property name="use_markup">True</property>
--		      <property name="justify">GTK_JUSTIFY_LEFT</property>
--		      <property name="wrap">False</property>
--		      <property name="selectable">False</property>
--		      <property name="xalign">0</property>
--		      <property name="yalign">0.5</property>
--		      <property name="xpad">0</property>
--		      <property name="ypad">0</property>
--		      <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property>
--		      <property name="width_chars">-1</property>
--		      <property name="single_line_mode">False</property>
--		      <property name="angle">0</property>
--		    </widget>
--		    <packing>
--		      <property name="padding">0</property>
--		      <property name="expand">False</property>
--		      <property name="fill">False</property>
--		    </packing>
--		  </child>
--
--		  <child>
--		    <widget class="GtkHBox" id="blank_cd_hbox">
--		      <property name="visible">True</property>
--		      <property name="homogeneous">False</property>
--		      <property name="spacing">12</property>
--
--		      <child>
--			<widget class="GtkImage" id="blank_cd_image">
--			  <property name="visible">True</property>
--			  <property name="xalign">0.5</property>
--			  <property name="yalign">0</property>
--			  <property name="xpad">0</property>
--			  <property name="ypad">0</property>
--			</widget>
--			<packing>
--			  <property name="padding">0</property>
--			  <property name="expand">False</property>
--			  <property name="fill">False</property>
--			</packing>
--		      </child>
--
--		      <child>
--			<widget class="GtkVBox" id="blank_cd_options_vbox">
--			  <property name="visible">True</property>
--			  <property name="homogeneous">False</property>
--			  <property name="spacing">6</property>
--
--			  <child>
--			    <widget class="GtkCheckButton" id="autoburn">
--			      <property name="visible">True</property>
--			      <property name="can_focus">True</property>
--			      <property name="label" translatable="yes">_Burn a CD or DVD when a blank disc is inserted</property>
--			      <property name="use_underline">True</property>
--			      <property name="relief">GTK_RELIEF_NORMAL</property>
--			      <property name="focus_on_click">True</property>
--			      <property name="active">False</property>
--			      <property name="inconsistent">False</property>
--			      <property name="draw_indicator">True</property>
--			    </widget>
--			    <packing>
--			      <property name="padding">0</property>
--			      <property name="expand">False</property>
--			      <property name="fill">False</property>
--			    </packing>
--			  </child>
--
--			  <child>
--			    <widget class="GtkVBox" id="autoburn_hbox">
--			      <property name="visible">True</property>
--			      <property name="homogeneous">False</property>
--			      <property name="spacing">12</property>
--
--			      <child>
--				<widget class="GtkHBox" id="hbox73">
--				  <property name="visible">True</property>
--				  <property name="homogeneous">False</property>
--				  <property name="spacing">0</property>
--
--				  <child>
--				    <widget class="GtkLabel" id="label32">
--				      <property name="visible">True</property>
--				      <property name="label" translatable="yes">    </property>
--				      <property name="use_underline">False</property>
--				      <property name="use_markup">False</property>
--				      <property name="justify">GTK_JUSTIFY_LEFT</property>
--				      <property name="wrap">False</property>
--				      <property name="selectable">False</property>
--				      <property name="xalign">0.5</property>
--				      <property name="yalign">0.5</property>
--				      <property name="xpad">0</property>
--				      <property name="ypad">0</property>
--				      <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property>
--				      <property name="width_chars">-1</property>
--				      <property name="single_line_mode">False</property>
--				      <property name="angle">0</property>
--				    </widget>
--				    <packing>
--				      <property name="padding">0</property>
--				      <property name="expand">False</property>
--				      <property name="fill">False</property>
--				    </packing>
--				  </child>
--
--				  <child>
--				    <widget class="GtkHBox" id="autoburn_audio_cd_hbox">
--				      <property name="visible">True</property>
--				      <property name="homogeneous">False</property>
--				      <property name="spacing">12</property>
--
--				      <child>
--					<widget class="GtkLabel" id="label35">
--					  <property name="visible">True</property>
--					  <property name="label" translatable="yes">Command for A_udio CDs:</property>
--					  <property name="use_underline">True</property>
--					  <property name="use_markup">False</property>
--					  <property name="justify">GTK_JUSTIFY_LEFT</property>
--					  <property name="wrap">False</property>
--					  <property name="selectable">False</property>
--					  <property name="xalign">0.5</property>
--					  <property name="yalign">0.5</property>
--					  <property name="xpad">0</property>
--					  <property name="ypad">0</property>
--					  <property name="mnemonic_widget">autoburn_audio_cd_command</property>
--					  <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property>
--					  <property name="width_chars">-1</property>
--					  <property name="single_line_mode">False</property>
--					  <property name="angle">0</property>
--					</widget>
--					<packing>
--					  <property name="padding">0</property>
--					  <property name="expand">False</property>
--					  <property name="fill">False</property>
--					</packing>
--				      </child>
--
--				      <child>
--					<widget class="GnomeFileEntry" id="autoburn_audio_cd_command_fileentry">
--					  <property name="visible">True</property>
--					  <property name="max_saved">10</property>
--					  <property name="browse_dialog_title" translatable="yes">Select program to burn audio CDs</property>
--					  <property name="directory_entry">False</property>
--					  <property name="modal">False</property>
--					  <property name="use_filechooser">True</property>
--					  <property name="filechooser_action">GTK_FILE_CHOOSER_ACTION_OPEN</property>
--
--					  <child internal-child="entry">
--					    <widget class="GtkEntry" id="autoburn_audio_cd_command">
--					      <property name="visible">True</property>
--					      <property name="can_focus">True</property>
--					      <property name="editable">True</property>
--					      <property name="visibility">True</property>
--					      <property name="max_length">0</property>
--					      <property name="text" translatable="yes"></property>
--					      <property name="has_frame">True</property>
--					      <property name="invisible_char">*</property>
--					      <property name="activates_default">False</property>
--					    </widget>
--					  </child>
--					</widget>
--					<packing>
--					  <property name="padding">0</property>
--					  <property name="expand">True</property>
--					  <property name="fill">True</property>
--					</packing>
--				      </child>
--				    </widget>
--				    <packing>
--				      <property name="padding">0</property>
--				      <property name="expand">True</property>
--				      <property name="fill">True</property>
--				    </packing>
--				  </child>
--				</widget>
--				<packing>
--				  <property name="padding">0</property>
--				  <property name="expand">True</property>
--				  <property name="fill">True</property>
--				</packing>
--			      </child>
--
--			      <child>
--				<widget class="GtkHBox" id="hbox74">
--				  <property name="visible">True</property>
--				  <property name="homogeneous">False</property>
--				  <property name="spacing">0</property>
--
--				  <child>
--				    <widget class="GtkLabel" id="label33">
--				      <property name="visible">True</property>
--				      <property name="label" translatable="yes">    </property>
--				      <property name="use_underline">False</property>
--				      <property name="use_markup">False</property>
--				      <property name="justify">GTK_JUSTIFY_LEFT</property>
--				      <property name="wrap">False</property>
--				      <property name="selectable">False</property>
--				      <property name="xalign">0.5</property>
--				      <property name="yalign">0.5</property>
--				      <property name="xpad">0</property>
--				      <property name="ypad">0</property>
--				      <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property>
--				      <property name="width_chars">-1</property>
--				      <property name="single_line_mode">False</property>
--				      <property name="angle">0</property>
--				    </widget>
--				    <packing>
--				      <property name="padding">0</property>
--				      <property name="expand">False</property>
--				      <property name="fill">False</property>
--				    </packing>
--				  </child>
--
--				  <child>
--				    <widget class="GtkHBox" id="autoburn_data_cd_hbox">
--				      <property name="visible">True</property>
--				      <property name="homogeneous">False</property>
--				      <property name="spacing">12</property>
--
--				      <child>
--					<widget class="GtkLabel" id="label37">
--					  <property name="visible">True</property>
--					  <property name="label" translatable="yes">Command for _Data CDs: </property>
--					  <property name="use_underline">True</property>
--					  <property name="use_markup">False</property>
--					  <property name="justify">GTK_JUSTIFY_LEFT</property>
--					  <property name="wrap">False</property>
--					  <property name="selectable">False</property>
--					  <property name="xalign">0.5</property>
--					  <property name="yalign">0.5</property>
--					  <property name="xpad">0</property>
--					  <property name="ypad">0</property>
--					  <property name="mnemonic_widget">autoburn_data_cd_command</property>
--					  <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property>
--					  <property name="width_chars">-1</property>
--					  <property name="single_line_mode">False</property>
--					  <property name="angle">0</property>
--					</widget>
--					<packing>
--					  <property name="padding">0</property>
--					  <property name="expand">False</property>
--					  <property name="fill">False</property>
--					</packing>
--				      </child>
--
--				      <child>
--					<widget class="GnomeFileEntry" id="autoburn_data_cd_command_fileentry">
--					  <property name="visible">True</property>
--					  <property name="max_saved">10</property>
--					  <property name="browse_dialog_title" translatable="yes">Select program to burn data CDs</property>
--					  <property name="directory_entry">False</property>
--					  <property name="modal">False</property>
--					  <property name="use_filechooser">True</property>
--					  <property name="filechooser_action">GTK_FILE_CHOOSER_ACTION_OPEN</property>
--
--					  <child internal-child="entry">
--					    <widget class="GtkEntry" id="autoburn_data_cd_command">
--					      <property name="visible">True</property>
--					      <property name="can_focus">True</property>
--					      <property name="editable">True</property>
--					      <property name="visibility">True</property>
--					      <property name="max_length">0</property>
--					      <property name="text" translatable="yes"></property>
--					      <property name="has_frame">True</property>
--					      <property name="invisible_char">*</property>
--					      <property name="activates_default">False</property>
--					    </widget>
--					  </child>
--					</widget>
--					<packing>
--					  <property name="padding">0</property>
--					  <property name="expand">True</property>
--					  <property name="fill">True</property>
--					</packing>
--				      </child>
--				    </widget>
--				    <packing>
--				      <property name="padding">0</property>
--				      <property name="expand">True</property>
--				      <property name="fill">True</property>
--				    </packing>
--				  </child>
--				</widget>
--				<packing>
--				  <property name="padding">0</property>
--				  <property name="expand">True</property>
--				  <property name="fill">True</property>
--				</packing>
--			      </child>
--			    </widget>
--			    <packing>
--			      <property name="padding">0</property>
--			      <property name="expand">True</property>
--			      <property name="fill">False</property>
--			    </packing>
--			  </child>
--			</widget>
--			<packing>
--			  <property name="padding">0</property>
--			  <property name="expand">True</property>
--			  <property name="fill">True</property>
--			</packing>
--		      </child>
--		    </widget>
--		    <packing>
--		      <property name="padding">0</property>
--		      <property name="expand">True</property>
--		      <property name="fill">True</property>
--		    </packing>
--		  </child>
--		</widget>
--		<packing>
--		  <property name="padding">0</property>
--		  <property name="expand">False</property>
--		  <property name="fill">True</property>
--		</packing>
--	      </child>
--	    </widget>
--	    <packing>
--	      <property name="tab_expand">False</property>
--	      <property name="tab_fill">True</property>
--	    </packing>
--	  </child>
--
--	  <child>
--	    <widget class="GtkLabel" id="storage_tab_label">
--	      <property name="visible">True</property>
--	      <property name="label" translatable="yes">Storage</property>
--	      <property name="use_underline">False</property>
--	      <property name="use_markup">False</property>
--	      <property name="justify">GTK_JUSTIFY_LEFT</property>
--	      <property name="wrap">False</property>
--	      <property name="selectable">False</property>
--	      <property name="xalign">0.5</property>
--	      <property name="yalign">0.5</property>
--	      <property name="xpad">0</property>
--	      <property name="ypad">0</property>
--	      <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property>
--	      <property name="width_chars">-1</property>
--	      <property name="single_line_mode">False</property>
--	      <property name="angle">0</property>
--	    </widget>
--	    <packing>
--	      <property name="type">tab</property>
--	    </packing>
--	  </child>
--
--	  <child>
--	    <widget class="GtkVBox" id="multimedia_vbox">
--	      <property name="border_width">12</property>
--	      <property name="visible">True</property>
--	      <property name="homogeneous">False</property>
--	      <property name="spacing">18</property>
--
--	      <child>
--		<widget class="GtkVBox" id="audio_cd_vbox">
--		  <property name="visible">True</property>
--		  <property name="homogeneous">False</property>
--		  <property name="spacing">6</property>
--
--		  <child>
--		    <widget class="GtkLabel" id="audio_cd_label">
--		      <property name="visible">True</property>
--		      <property name="label" translatable="yes">&lt;b&gt;Audio CD Discs&lt;/b&gt;</property>
--		      <property name="use_underline">False</property>
--		      <property name="use_markup">True</property>
--		      <property name="justify">GTK_JUSTIFY_LEFT</property>
--		      <property name="wrap">False</property>
--		      <property name="selectable">False</property>
--		      <property name="xalign">0</property>
--		      <property name="yalign">0.5</property>
--		      <property name="xpad">0</property>
--		      <property name="ypad">0</property>
--		      <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property>
--		      <property name="width_chars">-1</property>
--		      <property name="single_line_mode">False</property>
--		      <property name="angle">0</property>
--		    </widget>
--		    <packing>
--		      <property name="padding">0</property>
--		      <property name="expand">False</property>
--		      <property name="fill">False</property>
--		    </packing>
--		  </child>
--
--		  <child>
--		    <widget class="GtkHBox" id="audio_cd_hbox">
--		      <property name="visible">True</property>
--		      <property name="homogeneous">False</property>
--		      <property name="spacing">12</property>
--
--		      <child>
--			<widget class="GtkImage" id="audio_cd_image">
--			  <property name="visible">True</property>
--			  <property name="xalign">0.5</property>
--			  <property name="yalign">0</property>
--			  <property name="xpad">0</property>
--			  <property name="ypad">0</property>
--			</widget>
--			<packing>
--			  <property name="padding">0</property>
--			  <property name="expand">False</property>
--			  <property name="fill">False</property>
--			</packing>
--		      </child>
--
--		      <child>
--			<widget class="GtkVBox" id="audio_cd_options_vbox">
--			  <property name="visible">True</property>
--			  <property name="homogeneous">False</property>
--			  <property name="spacing">6</property>
--
--			  <child>
--			    <widget class="GtkCheckButton" id="autoplay_cda">
--			      <property name="visible">True</property>
--			      <property name="can_focus">True</property>
--			      <property name="label" translatable="yes">Play _audio CD discs when inserted</property>
--			      <property name="use_underline">True</property>
--			      <property name="relief">GTK_RELIEF_NORMAL</property>
--			      <property name="focus_on_click">True</property>
--			      <property name="active">False</property>
--			      <property name="inconsistent">False</property>
--			      <property name="draw_indicator">True</property>
--			    </widget>
--			    <packing>
--			      <property name="padding">0</property>
--			      <property name="expand">False</property>
--			      <property name="fill">False</property>
--			    </packing>
--			  </child>
--
--			  <child>
--			    <widget class="GtkHBox" id="hbox20">
--			      <property name="visible">True</property>
--			      <property name="homogeneous">False</property>
--			      <property name="spacing">0</property>
--
--			      <child>
--				<widget class="GtkLabel" id="label23">
--				  <property name="visible">True</property>
--				  <property name="label" translatable="yes">    </property>
--				  <property name="use_underline">False</property>
--				  <property name="use_markup">False</property>
--				  <property name="justify">GTK_JUSTIFY_LEFT</property>
--				  <property name="wrap">False</property>
--				  <property name="selectable">False</property>
--				  <property name="xalign">0.5</property>
--				  <property name="yalign">0.5</property>
--				  <property name="xpad">0</property>
--				  <property name="ypad">0</property>
--				  <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property>
--				  <property name="width_chars">-1</property>
--				  <property name="single_line_mode">False</property>
--				  <property name="angle">0</property>
--				</widget>
--				<packing>
--				  <property name="padding">0</property>
--				  <property name="expand">False</property>
--				  <property name="fill">False</property>
--				</packing>
--			      </child>
--
--			      <child>
--				<widget class="GtkHBox" id="autoplay_cda_hbox">
--				  <property name="visible">True</property>
--				  <property name="homogeneous">False</property>
--				  <property name="spacing">12</property>
--
--				  <child>
--				    <widget class="GtkLabel" id="autoplay_cda_command_label">
--				      <property name="visible">True</property>
--				      <property name="label" translatable="yes">C_ommand:</property>
--				      <property name="use_underline">True</property>
--				      <property name="use_markup">False</property>
--				      <property name="justify">GTK_JUSTIFY_RIGHT</property>
--				      <property name="wrap">False</property>
--				      <property name="selectable">False</property>
--				      <property name="xalign">0.5</property>
--				      <property name="yalign">0.5</property>
--				      <property name="xpad">0</property>
--				      <property name="ypad">0</property>
--				      <property name="mnemonic_widget">autoplay_cda_command</property>
--				      <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property>
--				      <property name="width_chars">-1</property>
--				      <property name="single_line_mode">False</property>
--				      <property name="angle">0</property>
--				    </widget>
--				    <packing>
--				      <property name="padding">0</property>
--				      <property name="expand">False</property>
--				      <property name="fill">False</property>
--				    </packing>
--				  </child>
--
--				  <child>
--				    <widget class="GnomeFileEntry" id="autoplay_cda_command_fileentry">
--				      <property name="visible">True</property>
--				      <property name="max_saved">10</property>
--				      <property name="browse_dialog_title" translatable="yes">Select program to play audio CDs</property>
--				      <property name="directory_entry">False</property>
--				      <property name="modal">False</property>
--				      <property name="use_filechooser">True</property>
--				      <property name="filechooser_action">GTK_FILE_CHOOSER_ACTION_OPEN</property>
--
--				      <child internal-child="entry">
--					<widget class="GtkEntry" id="autoplay_cda_command">
--					  <property name="visible">True</property>
--					  <property name="can_focus">True</property>
--					  <property name="editable">True</property>
--					  <property name="visibility">True</property>
--					  <property name="max_length">0</property>
--					  <property name="text" translatable="yes"></property>
--					  <property name="has_frame">True</property>
--					  <property name="invisible_char">*</property>
--					  <property name="activates_default">False</property>
--					</widget>
--				      </child>
--				    </widget>
--				    <packing>
--				      <property name="padding">0</property>
--				      <property name="expand">True</property>
--				      <property name="fill">True</property>
--				    </packing>
--				  </child>
--				</widget>
--				<packing>
--				  <property name="padding">0</property>
--				  <property name="expand">True</property>
--				  <property name="fill">True</property>
--				</packing>
--			      </child>
--			    </widget>
--			    <packing>
--			      <property name="padding">0</property>
--			      <property name="expand">True</property>
--			      <property name="fill">False</property>
--			    </packing>
--			  </child>
--			</widget>
--			<packing>
--			  <property name="padding">0</property>
--			  <property name="expand">True</property>
--			  <property name="fill">True</property>
--			</packing>
--		      </child>
--		    </widget>
--		    <packing>
--		      <property name="padding">0</property>
--		      <property name="expand">True</property>
--		      <property name="fill">True</property>
--		    </packing>
--		  </child>
--		</widget>
--		<packing>
--		  <property name="padding">0</property>
--		  <property name="expand">False</property>
--		  <property name="fill">True</property>
--		</packing>
--	      </child>
--
--	      <child>
--		<widget class="GtkVBox" id="dvd_video_vbox">
--		  <property name="visible">True</property>
--		  <property name="homogeneous">False</property>
--		  <property name="spacing">6</property>
--
--		  <child>
--		    <widget class="GtkLabel" id="dvd_video_label">
--		      <property name="visible">True</property>
--		      <property name="label" translatable="yes">&lt;b&gt;Video DVD Discs&lt;/b&gt;</property>
--		      <property name="use_underline">False</property>
--		      <property name="use_markup">True</property>
--		      <property name="justify">GTK_JUSTIFY_LEFT</property>
--		      <property name="wrap">False</property>
--		      <property name="selectable">False</property>
--		      <property name="xalign">0</property>
--		      <property name="yalign">0.5</property>
--		      <property name="xpad">0</property>
--		      <property name="ypad">0</property>
--		      <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property>
--		      <property name="width_chars">-1</property>
--		      <property name="single_line_mode">False</property>
--		      <property name="angle">0</property>
--		    </widget>
--		    <packing>
--		      <property name="padding">0</property>
--		      <property name="expand">False</property>
--		      <property name="fill">False</property>
--		    </packing>
--		  </child>
--
--		  <child>
--		    <widget class="GtkHBox" id="dvd_video_hbox">
--		      <property name="visible">True</property>
--		      <property name="homogeneous">False</property>
--		      <property name="spacing">12</property>
--
--		      <child>
--			<widget class="GtkImage" id="dvd_video_image">
--			  <property name="visible">True</property>
--			  <property name="xalign">0.5</property>
--			  <property name="yalign">0</property>
--			  <property name="xpad">0</property>
--			  <property name="ypad">0</property>
--			</widget>
--			<packing>
--			  <property name="padding">0</property>
--			  <property name="expand">False</property>
--			  <property name="fill">False</property>
--			</packing>
--		      </child>
--
--		      <child>
--			<widget class="GtkVBox" id="dvd_video_options_vbox">
--			  <property name="visible">True</property>
--			  <property name="homogeneous">False</property>
--			  <property name="spacing">6</property>
--
--			  <child>
--			    <widget class="GtkCheckButton" id="autoplay_dvd">
--			      <property name="visible">True</property>
--			      <property name="can_focus">True</property>
--			      <property name="label" translatable="yes">Play _video DVD discs when inserted</property>
--			      <property name="use_underline">True</property>
--			      <property name="relief">GTK_RELIEF_NORMAL</property>
--			      <property name="focus_on_click">True</property>
--			      <property name="active">False</property>
--			      <property name="inconsistent">False</property>
--			      <property name="draw_indicator">True</property>
--			    </widget>
--			    <packing>
--			      <property name="padding">0</property>
--			      <property name="expand">False</property>
--			      <property name="fill">False</property>
--			    </packing>
--			  </child>
--
--			  <child>
--			    <widget class="GtkHBox" id="hbox21">
--			      <property name="visible">True</property>
--			      <property name="homogeneous">False</property>
--			      <property name="spacing">0</property>
--
--			      <child>
--				<widget class="GtkLabel" id="label24">
--				  <property name="visible">True</property>
--				  <property name="label" translatable="yes">    </property>
--				  <property name="use_underline">False</property>
--				  <property name="use_markup">False</property>
--				  <property name="justify">GTK_JUSTIFY_LEFT</property>
--				  <property name="wrap">False</property>
--				  <property name="selectable">False</property>
--				  <property name="xalign">0.5</property>
--				  <property name="yalign">0.5</property>
--				  <property name="xpad">0</property>
--				  <property name="ypad">0</property>
--				  <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property>
--				  <property name="width_chars">-1</property>
--				  <property name="single_line_mode">False</property>
--				  <property name="angle">0</property>
--				</widget>
--				<packing>
--				  <property name="padding">0</property>
--				  <property name="expand">False</property>
--				  <property name="fill">False</property>
--				</packing>
--			      </child>
--
--			      <child>
--				<widget class="GtkHBox" id="autoplay_dvd_hbox">
--				  <property name="visible">True</property>
--				  <property name="homogeneous">False</property>
--				  <property name="spacing">12</property>
--
--				  <child>
--				    <widget class="GtkLabel" id="autoplay_dvd_command_label">
--				      <property name="visible">True</property>
--				      <property name="label" translatable="yes">Comma_nd:</property>
--				      <property name="use_underline">True</property>
--				      <property name="use_markup">False</property>
--				      <property name="justify">GTK_JUSTIFY_RIGHT</property>
--				      <property name="wrap">False</property>
--				      <property name="selectable">False</property>
--				      <property name="xalign">0.5</property>
--				      <property name="yalign">0.5</property>
--				      <property name="xpad">0</property>
--				      <property name="ypad">0</property>
--				      <property name="mnemonic_widget">autoplay_dvd_command</property>
--				      <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property>
--				      <property name="width_chars">-1</property>
--				      <property name="single_line_mode">False</property>
--				      <property name="angle">0</property>
--				    </widget>
--				    <packing>
--				      <property name="padding">0</property>
--				      <property name="expand">False</property>
--				      <property name="fill">False</property>
--				    </packing>
--				  </child>
--
--				  <child>
--				    <widget class="GnomeFileEntry" id="autoplay_dvd_command_fileentry">
--				      <property name="visible">True</property>
--				      <property name="max_saved">10</property>
--				      <property name="browse_dialog_title" translatable="yes">Select program to play DVDs</property>
--				      <property name="directory_entry">False</property>
--				      <property name="modal">False</property>
--				      <property name="use_filechooser">True</property>
--				      <property name="filechooser_action">GTK_FILE_CHOOSER_ACTION_OPEN</property>
--
--				      <child internal-child="entry">
--					<widget class="GtkEntry" id="autoplay_dvd_command">
--					  <property name="visible">True</property>
--					  <property name="can_focus">True</property>
--					  <property name="editable">True</property>
--					  <property name="visibility">True</property>
--					  <property name="max_length">0</property>
--					  <property name="text" translatable="yes"></property>
--					  <property name="has_frame">True</property>
--					  <property name="invisible_char">*</property>
--					  <property name="activates_default">False</property>
--					</widget>
--				      </child>
--				    </widget>
--				    <packing>
--				      <property name="padding">0</property>
--				      <property name="expand">True</property>
--				      <property name="fill">True</property>
--				    </packing>
--				  </child>
--				</widget>
--				<packing>
--				  <property name="padding">0</property>
--				  <property name="expand">True</property>
--				  <property name="fill">True</property>
--				</packing>
--			      </child>
--			    </widget>
--			    <packing>
--			      <property name="padding">0</property>
--			      <property name="expand">True</property>
--			      <property name="fill">False</property>
--			    </packing>
--			  </child>
--			</widget>
--			<packing>
--			  <property name="padding">0</property>
--			  <property name="expand">True</property>
--			  <property name="fill">True</property>
--			</packing>
--		      </child>
--		    </widget>
--		    <packing>
--		      <property name="padding">0</property>
--		      <property name="expand">True</property>
--		      <property name="fill">True</property>
--		    </packing>
--		  </child>
--		</widget>
--		<packing>
--		  <property name="padding">0</property>
--		  <property name="expand">False</property>
--		  <property name="fill">True</property>
--		</packing>
--	      </child>
--
--	      <child>
--		<widget class="GtkVBox" id="ipod_vbox">
--		  <property name="visible">True</property>
--		  <property name="homogeneous">False</property>
--		  <property name="spacing">6</property>
--
--		  <child>
--		    <widget class="GtkLabel" id="ipod_label">
--		      <property name="visible">True</property>
--		      <property name="label" translatable="yes">&lt;b&gt;Portable Music Players&lt;/b&gt;</property>
--		      <property name="use_underline">False</property>
--		      <property name="use_markup">True</property>
--		      <property name="justify">GTK_JUSTIFY_LEFT</property>
--		      <property name="wrap">False</property>
--		      <property name="selectable">False</property>
--		      <property name="xalign">0</property>
--		      <property name="yalign">0.5</property>
--		      <property name="xpad">0</property>
--		      <property name="ypad">0</property>
--		      <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property>
--		      <property name="width_chars">-1</property>
--		      <property name="single_line_mode">False</property>
--		      <property name="angle">0</property>
--		    </widget>
--		    <packing>
--		      <property name="padding">0</property>
--		      <property name="expand">False</property>
--		      <property name="fill">False</property>
--		    </packing>
--		  </child>
--
--		  <child>
--		    <widget class="GtkHBox" id="ipod_hbox">
--		      <property name="visible">True</property>
--		      <property name="homogeneous">False</property>
--		      <property name="spacing">12</property>
--
--		      <child>
--			<widget class="GtkImage" id="ipod_image">
--			  <property name="visible">True</property>
--			  <property name="xalign">0.5</property>
--			  <property name="yalign">0</property>
--			  <property name="xpad">0</property>
--			  <property name="ypad">0</property>
--			</widget>
--			<packing>
--			  <property name="padding">0</property>
--			  <property name="expand">False</property>
--			  <property name="fill">False</property>
--			</packing>
--		      </child>
--
--		      <child>
--			<widget class="GtkVBox" id="ipod_options_vbox">
--			  <property name="visible">True</property>
--			  <property name="homogeneous">False</property>
--			  <property name="spacing">6</property>
--
--			  <child>
--			    <widget class="GtkCheckButton" id="autoipod">
--			      <property name="visible">True</property>
--			      <property name="can_focus">True</property>
--			      <property name="label" translatable="yes">Play _music files when connected</property>
--			      <property name="use_underline">True</property>
--			      <property name="relief">GTK_RELIEF_NORMAL</property>
--			      <property name="focus_on_click">True</property>
--			      <property name="active">False</property>
--			      <property name="inconsistent">False</property>
--			      <property name="draw_indicator">True</property>
--			    </widget>
--			    <packing>
--			      <property name="padding">0</property>
--			      <property name="expand">False</property>
--			      <property name="fill">False</property>
--			    </packing>
--			  </child>
--
--			  <child>
--			    <widget class="GtkHBox" id="hbox72">
--			      <property name="visible">True</property>
--			      <property name="homogeneous">False</property>
--			      <property name="spacing">0</property>
--
--			      <child>
--				<widget class="GtkLabel" id="label30">
--				  <property name="visible">True</property>
--				  <property name="label" translatable="yes">    </property>
--				  <property name="use_underline">False</property>
--				  <property name="use_markup">False</property>
--				  <property name="justify">GTK_JUSTIFY_LEFT</property>
--				  <property name="wrap">False</property>
--				  <property name="selectable">False</property>
--				  <property name="xalign">0.5</property>
--				  <property name="yalign">0.5</property>
--				  <property name="xpad">0</property>
--				  <property name="ypad">0</property>
--				  <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property>
--				  <property name="width_chars">-1</property>
--				  <property name="single_line_mode">False</property>
--				  <property name="angle">0</property>
--				</widget>
--				<packing>
--				  <property name="padding">0</property>
--				  <property name="expand">False</property>
--				  <property name="fill">False</property>
--				</packing>
--			      </child>
--
--			      <child>
--				<widget class="GtkHBox" id="autoipod_hbox">
--				  <property name="visible">True</property>
--				  <property name="homogeneous">False</property>
--				  <property name="spacing">12</property>
--
--				  <child>
--				    <widget class="GtkLabel" id="autoipod_command_label">
--				      <property name="visible">True</property>
--				      <property name="label" translatable="yes">Comman_d:</property>
--				      <property name="use_underline">True</property>
--				      <property name="use_markup">False</property>
--				      <property name="justify">GTK_JUSTIFY_RIGHT</property>
--				      <property name="wrap">False</property>
--				      <property name="selectable">False</property>
--				      <property name="xalign">0.5</property>
--				      <property name="yalign">0.5</property>
--				      <property name="xpad">0</property>
--				      <property name="ypad">0</property>
--				      <property name="mnemonic_widget">autoipod_command</property>
--				      <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property>
--				      <property name="width_chars">-1</property>
--				      <property name="single_line_mode">False</property>
--				      <property name="angle">0</property>
--				    </widget>
--				    <packing>
--				      <property name="padding">0</property>
--				      <property name="expand">False</property>
--				      <property name="fill">False</property>
--				    </packing>
--				  </child>
--
--				  <child>
--				    <widget class="GnomeFileEntry" id="autoipod_command_fileentry">
--				      <property name="visible">True</property>
--				      <property name="max_saved">10</property>
--				      <property name="browse_dialog_title" translatable="yes">Select program to play music files</property>
--				      <property name="directory_entry">False</property>
--				      <property name="modal">False</property>
--				      <property name="use_filechooser">True</property>
--				      <property name="filechooser_action">GTK_FILE_CHOOSER_ACTION_OPEN</property>
--
--				      <child internal-child="entry">
--					<widget class="GtkEntry" id="autoipod_command">
--					  <property name="visible">True</property>
--					  <property name="can_focus">True</property>
--					  <property name="editable">True</property>
--					  <property name="visibility">True</property>
--					  <property name="max_length">0</property>
--					  <property name="text" translatable="yes"></property>
--					  <property name="has_frame">True</property>
--					  <property name="invisible_char">*</property>
--					  <property name="activates_default">False</property>
--					</widget>
--				      </child>
--				    </widget>
--				    <packing>
--				      <property name="padding">0</property>
--				      <property name="expand">True</property>
--				      <property name="fill">True</property>
--				    </packing>
--				  </child>
--				</widget>
--				<packing>
--				  <property name="padding">0</property>
--				  <property name="expand">True</property>
--				  <property name="fill">True</property>
--				</packing>
--			      </child>
--			    </widget>
--			    <packing>
--			      <property name="padding">0</property>
--			      <property name="expand">True</property>
--			      <property name="fill">True</property>
--			    </packing>
--			  </child>
--			</widget>
--			<packing>
--			  <property name="padding">0</property>
--			  <property name="expand">True</property>
--			  <property name="fill">True</property>
--			</packing>
--		      </child>
--		    </widget>
--		    <packing>
--		      <property name="padding">0</property>
--		      <property name="expand">True</property>
--		      <property name="fill">True</property>
--		    </packing>
--		  </child>
--		</widget>
--		<packing>
--		  <property name="padding">0</property>
--		  <property name="expand">False</property>
--		  <property name="fill">True</property>
--		</packing>
--	      </child>
--	    </widget>
--	    <packing>
--	      <property name="tab_expand">False</property>
--	      <property name="tab_fill">True</property>
--	    </packing>
--	  </child>
--
--	  <child>
--	    <widget class="GtkLabel" id="multimedia_tab_label">
--	      <property name="visible">True</property>
--	      <property name="label" translatable="yes">Multimedia</property>
--	      <property name="use_underline">False</property>
--	      <property name="use_markup">False</property>
--	      <property name="justify">GTK_JUSTIFY_LEFT</property>
--	      <property name="wrap">False</property>
--	      <property name="selectable">False</property>
--	      <property name="xalign">0.5</property>
--	      <property name="yalign">0.5</property>
--	      <property name="xpad">0</property>
--	      <property name="ypad">0</property>
--	      <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property>
--	      <property name="width_chars">-1</property>
--	      <property name="single_line_mode">False</property>
--	      <property name="angle">0</property>
--	    </widget>
--	    <packing>
--	      <property name="type">tab</property>
--	    </packing>
--	  </child>
--
--	  <child>
- 	    <widget class="GtkVBox" id="cameras_vbox">
- 	      <property name="border_width">12</property>
- 	      <property name="visible">True</property>
-diff -Nur -x '*.orig' -x '*~' gnome-volume-manager-2.22.1/src/manager.c gnome-volume-manager-2.22.1.new/src/manager.c
---- gnome-volume-manager-2.22.1/src/manager.c	2008-01-18 17:30:22.000000000 +0100
-+++ src/manager.c	2008-02-29 16:30:12.000000000 +0100
-@@ -625,6 +625,27 @@
- 	}
- }
- 
-+static gboolean
-+filter_out_media_handling (gint key, gboolean value)
-+{
-+       switch (key) {
-+       case AUTOBROWSE:
-+       case AUTOBURN:
-+       case AUTOIPOD:
-+       case AUTOMOUNT_DRIVES:
-+       case AUTOMOUNT_MEDIA:
-+       case AUTOOPEN:
-+       case AUTOPLAY_CDA:
-+       case AUTOPLAY_DVD:
-+       case AUTOPLAY_VCD:
-+       case AUTORUN:
-+               return FALSE;
-+       default:
-+               return value;
-+       }
-+}
-+
-+
- /*
-  * gvm_load_config - synchronize gconf => config structure
-  */
-@@ -644,7 +665,7 @@
- 			     *((char **) gvm_settings[i].var) ? *((char **) gvm_settings[i].var): "NULL");
- 		} else if (gvm_settings[i].type == TYPE_BOOL) {
- 			*((int *) gvm_settings[i].var) =
--				gconf_client_get_bool (config.client, gvm_settings[i].key, NULL);
-+				filter_out_media_handling (i, gconf_client_get_bool (config.client, gvm_settings[i].key, NULL));
- 			dbg ("setting[%d]: bool: %s = %d\n", i, strrchr (gvm_settings[i].key, '/') + 1,
- 			     *((int *) gvm_settings[i].var));
- 		} else if (gvm_settings[i].type == TYPE_FLOAT) {
-@@ -693,7 +714,7 @@
- 		dbg ("setting changed: string: %s = %s\n", strrchr (gvm_settings[which].key, '/') + 1,
- 		     *((char **) gvm_settings[which].var));
- 	} else if (gvm_settings[which].type == TYPE_BOOL) {
--		*((int *) gvm_settings[which].var) = gconf_value_get_bool (value);
-+		*((int *) gvm_settings[which].var) = filter_out_media_handling (which, gconf_value_get_bool (value));
- 		dbg ("setting changed: bool: %s = %d\n", strrchr (gvm_settings[which].key, '/') + 1,
- 		     *((int *) gvm_settings[which].var));
- 	} else if (gvm_settings[which].type == TYPE_FLOAT) {
-diff -Nur -x '*.orig' -x '*~' gnome-volume-manager-2.22.1/src/properties.c gnome-volume-manager-2.22.1.new/src/properties.c
---- gnome-volume-manager-2.22.1/src/properties.c	2007-12-07 18:55:46.000000000 +0100
-+++ src/properties.c	2008-02-29 16:30:08.000000000 +0100
-@@ -36,77 +36,24 @@
- 	TYPE_STRING,
- } type_t;
- 
--enum {
--	AUTOBROWSE,
--	AUTOBURN,
--	AUTOBURN_AUDIO_CD_COMMAND,
--	AUTOBURN_DATA_CD_COMMAND,
--	AUTOIPOD,
--	AUTOIPOD_COMMAND,
--	AUTOKEYBOARD,
--	AUTOKEYBOARD_COMMAND,
--	AUTOMOUNT_DRIVES,
--	AUTOMOUNT_MEDIA,
--	AUTOMOUSE,
--	AUTOMOUSE_COMMAND,
--	AUTOOPEN,
--	AUTOPHOTO,
--	AUTOPHOTO_COMMAND,
--	AUTOPILOT,
--	AUTOPILOT_COMMAND,
--	AUTOPLAY_CDA,
--	AUTOPLAY_CDA_COMMAND,
--	AUTOPLAY_DVD,
--	AUTOPLAY_DVD_COMMAND,
--	AUTOPOCKETPC,
--	AUTOPOCKETPC_COMMAND,
--	AUTOPRINTER,
--	AUTOPRINTER_COMMAND,
--	AUTORUN,
--	AUTOSCANNER,
--	AUTOSCANNER_COMMAND,
--	AUTOTABLET,
--	AUTOTABLET_COMMAND,
--	AUTOVIDEOCAM,
--	AUTOVIDEOCAM_COMMAND,
--	AUTOWEBCAM,
--	AUTOWEBCAM_COMMAND,
--	AUTORUN_PATH,
--	AUTOOPEN_PATH,
--};
--
- static struct {
- 	char *key;
- 	type_t type;
- 	GtkWidget *widget;
- 	gboolean need_daemon;
- } gvm_settings[] = {
--	{ GCONF_ROOT "autobrowse",                TYPE_BOOL,   NULL, TRUE  },
--	{ GCONF_ROOT "autoburn",                  TYPE_BOOL,   NULL, FALSE },
--	{ GCONF_ROOT "autoburn_audio_cd_command", TYPE_STRING, NULL, FALSE },
--	{ GCONF_ROOT "autoburn_data_cd_command",  TYPE_STRING, NULL, FALSE },
--	{ GCONF_ROOT "autoipod",                  TYPE_BOOL,   NULL, TRUE  },
--	{ GCONF_ROOT "autoipod_command",          TYPE_STRING, NULL, FALSE },
- 	{ GCONF_ROOT "autokeyboard",              TYPE_BOOL,   NULL, TRUE  },
- 	{ GCONF_ROOT "autokeyboard_command",      TYPE_STRING, NULL, FALSE },
--	{ GCONF_ROOT "automount_drives",          TYPE_BOOL,   NULL, TRUE  },
--	{ GCONF_ROOT "automount_media",           TYPE_BOOL,   NULL, TRUE  },
- 	{ GCONF_ROOT "automouse",                 TYPE_BOOL,   NULL, TRUE  },
- 	{ GCONF_ROOT "automouse_command",         TYPE_STRING, NULL, FALSE },
--	{ GCONF_ROOT "autoopen",                  TYPE_BOOL,   NULL, TRUE  },
- 	{ GCONF_ROOT "autophoto",                 TYPE_BOOL,   NULL, TRUE  },
- 	{ GCONF_ROOT "autophoto_command",         TYPE_STRING, NULL, FALSE },
- 	{ GCONF_ROOT "autopalmsync",              TYPE_BOOL,   NULL, TRUE  },
- 	{ GCONF_ROOT "autopalmsync_command",      TYPE_STRING, NULL, FALSE },
--	{ GCONF_ROOT "autoplay_cda",              TYPE_BOOL,   NULL, TRUE  },
--	{ GCONF_ROOT "autoplay_cda_command",      TYPE_STRING, NULL, FALSE },
--	{ GCONF_ROOT "autoplay_dvd",              TYPE_BOOL,   NULL, TRUE  },
--	{ GCONF_ROOT "autoplay_dvd_command",      TYPE_STRING, NULL, FALSE },
- 	{ GCONF_ROOT "autopocketpc",              TYPE_BOOL,   NULL, TRUE  },
- 	{ GCONF_ROOT "autopocketpc_command",      TYPE_STRING, NULL, FALSE },
- 	{ GCONF_ROOT "autoprinter",               TYPE_BOOL,   NULL, TRUE  },
- 	{ GCONF_ROOT "autoprinter_command",       TYPE_STRING, NULL, FALSE },
--	{ GCONF_ROOT "autorun",                   TYPE_BOOL,   NULL, TRUE  },
- 	{ GCONF_ROOT "autoscanner",               TYPE_BOOL,   NULL, TRUE  },
- 	{ GCONF_ROOT "autoscanner_command",       TYPE_STRING, NULL, FALSE },
- 	{ GCONF_ROOT "autotablet",                TYPE_BOOL,   NULL, TRUE  },
-@@ -115,9 +62,6 @@
- 	{ GCONF_ROOT "autovideocam_command",      TYPE_STRING, NULL, FALSE },
- 	{ GCONF_ROOT "autowebcam",                TYPE_BOOL,   NULL, TRUE  },
- 	{ GCONF_ROOT "autowebcam_command",        TYPE_STRING, NULL, FALSE },
--	/* The following entries do not (yet) have a UI */
--	/*{ GCONF_ROOT "autorun_path",         TYPE_STRING, NULL, FALSE },*/
--	/*{ GCONF_ROOT "autoopen_path",        TYPE_STRING, NULL, FALSE },*/
- };
- 
- static GHashTable *gvm_settings_hash = NULL;
-@@ -151,17 +95,10 @@
- 		gconf_client_set_bool (gconf, key, bool, NULL);
- 	
- 	name = strrchr (key, '/') + 1;
--	if (!strncmp (name, "automount_", 10)) {
--		bool = gtk_toggle_button_get_active (GTK_TOGGLE_BUTTON (gvm_settings[AUTOMOUNT_MEDIA].widget)) ||
--			gtk_toggle_button_get_active (GTK_TOGGLE_BUTTON (gvm_settings[AUTOMOUNT_DRIVES].widget));
--		gtk_widget_set_sensitive (gvm_settings[AUTOOPEN].widget, bool);
--		gtk_widget_set_sensitive (gvm_settings[AUTORUN].widget, bool);
--	} else {
--		name = g_strdup_printf ("%s_hbox", name);
--		if ((hbox = glade_xml_get_widget (xml, name)))
--			gtk_widget_set_sensitive (hbox, bool);
--		g_free (name);
--	}
-+	name = g_strdup_printf ("%s_hbox", name);
-+	if ((hbox = glade_xml_get_widget (xml, name)))
-+		gtk_widget_set_sensitive (hbox, bool);
-+	g_free (name);
- }
- 
- static void
-@@ -205,11 +142,6 @@
- 	gboolean bool;
- 	size_t i;
- 	
--	/* this is the only strange one */
--	bool = gtk_toggle_button_get_active (GTK_TOGGLE_BUTTON (gvm_settings[AUTOMOUNT_MEDIA].widget)) ||
--		gtk_toggle_button_get_active (GTK_TOGGLE_BUTTON (gvm_settings[AUTOMOUNT_DRIVES].widget));
--	gtk_widget_set_sensitive (gvm_settings[AUTORUN].widget, bool);
--	
- 	/* checkboxes can enable/disable the ability to change other settings */
- 	for (i = 0; i < G_N_ELEMENTS (gvm_settings); i++) {
- 		if (gvm_settings[i].type == TYPE_BOOL) {
-@@ -277,17 +209,12 @@
- 	const char *icon;
- 	const char *fallback;
- } icons[] = {
--	{ "audio_cd_image",         "gnome-dev-cdrom-audio", "media-optical"  },
--	{ "blank_cd_image",         "gnome-dev-disc-cdr",    "media-optical"  },
- 	{ "digital_camera_image",   "camera-photo",          NULL             },
--	{ "dvd_video_image",        "gnome-dev-dvd",         "media-optical"  },
--	{ "ipod_image",             "multimedia-player",     "gnome-dev-ipod" },
- 	{ "keyboard_image",         "input-keyboard",        NULL             },
- 	{ "mouse_image",            "input-mouse",           NULL             },
- 	{ "palm_image",             "pda-palm",              "palm-pilot"     },
- 	{ "pocketpc_image",         "pda-pocketpc",          "palm-pilot"     },
- 	{ "printer_image",          "printer",               NULL             },
--	{ "removable_drives_image", "drive-removable-media", NULL             },
- 	{ "scanner_image",          "scanner",               NULL             },
- 	{ "tablet_image",           "input-tablet",          NULL             },
- 	{ "videocam_image",         "camera-video",          NULL             },
diff --git a/sysutils/gnome-volume-manager/files/patch-gnome-volume-manager.schemas.in b/sysutils/gnome-volume-manager/files/patch-gnome-volume-manager.schemas.in
deleted file mode 100644
index 94af083a1..000000000
--- a/sysutils/gnome-volume-manager/files/patch-gnome-volume-manager.schemas.in
+++ /dev/null
@@ -1,11 +0,0 @@
---- gnome-volume-manager.schemas.in.orig	Wed Jun  7 21:41:12 2006
-+++ gnome-volume-manager.schemas.in	Wed Jun  7 21:41:40 2006
-@@ -227,7 +227,7 @@
-         <key>/schemas/desktop/gnome/volume_manager/autoprinter_command</key>
- 	<applyto>/desktop/gnome/volume_manager/autoprinter_command</applyto>
- 	<type>string</type>
--	<default>gnome-printer-add hal://%h</default>
-+	<default>gnome-cups-add hal://%h</default>
- 	<locale name="C">
- 	  <short>printer command</short>
- 	  <long>Command to run when a printer is connected.</long>
diff --git a/sysutils/gnome-volume-manager/files/patch-src_manager.c b/sysutils/gnome-volume-manager/files/patch-src_manager.c
deleted file mode 100644
index 13e0cbf7f..000000000
--- a/sysutils/gnome-volume-manager/files/patch-src_manager.c
+++ /dev/null
@@ -1,232 +0,0 @@
---- src/manager.c.orig	2006-11-07 13:01:17.000000000 -0500
-+++ src/manager.c	2007-10-17 00:14:10.000000000 -0400
-@@ -23,9 +23,12 @@
- #include <sys/types.h>
- #include <sys/stat.h>
- #include <dirent.h>
-+#include <fcntl.h>
- #include <signal.h>
- #include <unistd.h>
- #include <utmp.h>
-+#include <sys/param.h>
-+#include <sys/mount.h>
- 
- #include <locale.h>
- 
-@@ -1556,12 +1559,27 @@ enum {
- 	MOUNT_UID        = (1 << 15),
- 	MOUNT_UMASK      = (1 << 16),
- 	MOUNT_UTF8       = (1 << 17),
-+	MOUNT_LOCALE     = (1 << 18),
-+	MOUNT_LONGNAME   = (1 << 19),
- };
- 
- static struct {
- 	const char *name;
- 	guint32 flag;
- } mount_options[] = {
-+#ifdef __FreeBSD__
-+	{ "-D=",	MOUNT_CODEPAGE   },  /* vfat */
-+	{ "-M=",	MOUNT_DMASK      },  /* vfat */
-+	{ "-m=",	MOUNT_FMASK      },  /* vfat, ntfs */
-+	{ "-L=",	MOUNT_LOCALE     },  /* vfat */
-+	{ "-C=",	MOUNT_IOCHARSET  },  /* ntfs, ios9660 */
-+	{ "noatime",	MOUNT_NOATIME    },
-+	{ "noexec",	MOUNT_NOEXEC     },
-+	{ "ro",		MOUNT_READ_ONLY  },
-+	{ "longnames",	MOUNT_LONGNAME   },  /* vfat */
-+	{ "sync",	MOUNT_SYNC       },
-+	{ "-u=",	MOUNT_UID        },  /* vfat, ntfs */
-+#else
- 	{ "codepage=",  MOUNT_CODEPAGE   },  /* vfat */
- 	{ "data=",      MOUNT_DATA       },  /* ext3 */
- 	{ "dirsync",    MOUNT_DIRSYNC    },
-@@ -1580,6 +1598,7 @@ static struct {
- 	{ "uid=",       MOUNT_UID        },  /* vfat, ntfs, udf, iso9660 */
- 	{ "umask=",     MOUNT_UMASK      },  /* vfat, ntfs, udf */
- 	{ "utf8",       MOUNT_UTF8       },  /* vfat, iso9660 */
-+#endif
- };
- 
- 
-@@ -1760,10 +1779,17 @@ gvm_mount_options (GPtrArray *options, g
- 		g_slist_free_1 (l);
- 	}
- 	
-+#ifndef __FreeBSD__
- 	if (opts & MOUNT_UID) {
- 		option = g_strdup_printf ("uid=%u", getuid ());
- 		g_ptr_array_add (options, option);
- 	}
-+#else
-+	if (opts & MOUNT_UID && (!strcmp (where, "vfat") || !strcmp (where, "ntfs"))) {
-+		option = g_strdup_printf ("u=%u", getuid ());
-+		g_ptr_array_add (options, option);
-+	}
-+#endif
- 	
- 	return TRUE;
- }
-@@ -1813,7 +1839,7 @@ gvm_device_mount (const char *udi, gbool
- 		
- 		return retval;
- 	} else {
--		char *mount_point, *fstype, *drive, **moptions, fmask_opt[12], *charset_opt = NULL;
-+		char *mount_point, *fstype, *drive, **moptions, fmask_opt[12], *charset_opt = NULL, *locale_opt = NULL;
- 		DBusMessage *dmesg, *reply;
- 		gboolean freev = FALSE;
- 		GPtrArray *options;
-@@ -1893,21 +1919,86 @@ gvm_device_mount (const char *udi, gbool
- 				
- 				if (opts & MOUNT_FMASK) {
- 					mask = umask (0);
-+#ifdef __FreeBSD__
-+					snprintf (fmask_opt, sizeof (fmask_opt), "-m=%#o", mask | 0111);
-+#else
- 					snprintf (fmask_opt, sizeof (fmask_opt), "fmask=%#o", mask | 0111);
-+#endif
- 					g_ptr_array_add (options, fmask_opt);
- 					umask (mask);
- 				}
- 				
- 				if (opts & MOUNT_SHORTNAME)
- 					g_ptr_array_add (options, "shortname=lower");
-+				if (opts & MOUNT_LONGNAME)
-+					g_ptr_array_add (options, "longnames");
-+
-+				if (opts & MOUNT_LOCALE) {
-+					char *locale;
-+
-+					locale = setlocale(LC_ALL, NULL);
-+					if (!locale)
-+						locale = getenv("LANG");
-+					if (locale) {
-+
-+						locale_opt = g_strdup_printf ("-L=%s", locale);
-+						g_ptr_array_add (options, locale_opt);
-+					}
-+				}
-+
-+#ifdef __FreeBSD__
-+				if (opts & MOUNT_CODEPAGE) {
-+					if ((iocharset = gvm_iocharset ())) {
-+						charset_opt = g_strdup_printf ("-D=%s", iocharset);
-+						g_ptr_array_add (options, charset_opt);
-+					}
-+				}
-+
-+				if (opts & MOUNT_UID) {
-+					snprintf (uid, sizeof (uid) - 1, "-u=%s", getuid ());
-+					g_ptr_array_add (options, uid);
-+				}
-+#endif
- 			} else if (!strcmp (fstype, "iso9660")) {
- 				/* only care about uid= and iocharset= */
-+#ifdef __FreeBSD__
-+				if (opts & MOUNT_IOCHARSET) {
-+					if ((iocharset = gvm_iocharset ())) {
-+						charset_opt = g_strdup_printf ("-C=%s", iocharset);
-+						g_ptr_array_add (options, charset_opt);
-+					}
-+				}
-+#endif
- 			} else if (!strcmp (fstype, "udf")) {
- 				/* also care about uid= and iocharset= */
- 				if (opts & MOUNT_NOATIME)
- 					g_ptr_array_add (options, "noatime");
-+#ifdef __FreeBSD__
-+				if (opts & MOUNT_IOCHARSET) {
-+					if ((iocharset = gvm_iocharset ())) {
-+						charset_opt = g_strdup_printf ("-C=%s", iocharset);
-+						g_ptr_array_add (options, charset_opt);
-+					}
-+				}
-+#endif
-+			} else if (!strcmp (fstype, "ntfs")) {
-+				/* only care about uid= and iocharset= */
-+#ifdef __FreeBSD__
-+				if (opts & MOUNT_IOCHARSET) {
-+					if ((iocharset = gvm_iocharset ())) {
-+						charset_opt = g_strdup_printf ("-C=%s", iocharset);
-+						g_ptr_array_add (options, charset_opt);
-+					}
-+				}
-+
-+				if (opts & MOUNT_UID) {
-+					snprintf (uid, sizeof (uid) - 1, "-u=%s", getuid ());
-+					g_ptr_array_add (options, uid);
-+				}
-+#endif
- 			}
- 			
-+#ifndef __FreeBSD__
- 			if (opts & (MOUNT_IOCHARSET|MOUNT_UTF8)) {
- 				if ((iocharset = gvm_iocharset ())) {
- 					if ((opts & MOUNT_UTF8) && !strcmp (iocharset, "utf8")) {
-@@ -1923,6 +2014,7 @@ gvm_device_mount (const char *udi, gbool
- 				snprintf (uid, sizeof (uid) - 1, "uid=%u", getuid ());
- 				g_ptr_array_add (options, uid);
- 			}
-+#endif
- 			
- 			libhal_free_string (fstype);
- 		}
-@@ -1947,6 +2039,7 @@ gvm_device_mount (const char *udi, gbool
- 		
- 		g_ptr_array_free (options, TRUE);
- 		g_free (charset_opt);
-+		g_free (locale_opt);
- 		
- 		policy = g_new (struct _MountPolicy, 1);
- 		policy->udi = g_strdup (udi);
-@@ -3185,6 +3278,12 @@ gvm_local_user (void)
- 	size_t n;
- 	DIR *dir;
- 	int vt;
-+#ifndef __linux__
-+	int bytes, fd;
-+	struct stat sb;
-+	struct utmp buf[1024];
-+	size_t len;
-+#endif
- 	
- 	if (local & LOCAL_USER_CHECKED)
- 		return (local & LOCAL_USER_FOUND);
-@@ -3208,6 +3307,7 @@ gvm_local_user (void)
- 	
-  fallback:
- 	
-+#ifdef __linux__
- 	if (!(local & LOCAL_USER_FOUND)) {
- 		setutent ();
- 		
-@@ -3222,6 +3322,29 @@ gvm_local_user (void)
- 		
- 		endutent ();
- 	}
-+#else
-+	if ((fd = open (_PATH_UTMP, O_RDONLY, 0)) < 0 || fstat(fd, &sb) == -1) {
-+		close (fd);
-+		return TRUE;
-+	}
-+
-+	len = (sb.st_size + sizeof(buf) - 1) / sizeof(buf);
-+
-+	while (!local && len-- > 0) {
-+		if (lseek(fd, (off_t) (len * sizeof(buf)), L_SET) == -1 ||
-+				(bytes = read (fd, buf, sizeof(buf))) == -1) {
-+			close (fd);
-+			return TRUE;
-+		}
-+		for (utmp = &buf[bytes / sizeof(buf[0]) - 1]; !local && utmp >= buf; --utmp) {
-+			if (!utmp->ut_name[0] || strncmp (utmp->ut_name, user, n) != 0)
-+				continue;
-+			local = utmp->ut_host[0] == ':' && utmp->ut_host[1] >= '0' && utmp->ut_host[1] <= '9' || !strncmp (utmp->ut_line, "ttyv", 4) ? LOCAL_USER_FOUND : 0;
-+		}
-+	}
-+
-+	close (fd);
-+#endif
- 	
- 	local |= LOCAL_USER_CHECKED;
- 	
diff --git a/sysutils/gnome-volume-manager/pkg-descr b/sysutils/gnome-volume-manager/pkg-descr
deleted file mode 100644
index b8ce9b768..000000000
--- a/sysutils/gnome-volume-manager/pkg-descr
+++ /dev/null
@@ -1,3 +0,0 @@
-gnome-volume-manager is a desktop-level daemon that enforces volume-related
-policy in response to events received from HAL. Its goal is to implement all
-functionality as a state-machine in response to asynchronous events from HAL.
diff --git a/sysutils/gnome-volume-manager/pkg-plist b/sysutils/gnome-volume-manager/pkg-plist
deleted file mode 100644
index a3d4526cf..000000000
--- a/sysutils/gnome-volume-manager/pkg-plist
+++ /dev/null
@@ -1,106 +0,0 @@
-bin/gnome-volume-properties
-etc/xdg/autostart/gnome-volume-manager.desktop
-libexec/gnome-volume-manager
-share/applications/gnome-volume-properties.desktop
-%%DATADIR%%/gnome-volume-properties.glade
-share/locale/ang/LC_MESSAGES/gnome-volume-manager.mo
-share/locale/ar/LC_MESSAGES/gnome-volume-manager.mo
-share/locale/az/LC_MESSAGES/gnome-volume-manager.mo
-share/locale/be@latin/LC_MESSAGES/gnome-volume-manager.mo
-share/locale/bg/LC_MESSAGES/gnome-volume-manager.mo
-share/locale/bn/LC_MESSAGES/gnome-volume-manager.mo
-share/locale/bn_IN/LC_MESSAGES/gnome-volume-manager.mo
-share/locale/bs/LC_MESSAGES/gnome-volume-manager.mo
-share/locale/ca/LC_MESSAGES/gnome-volume-manager.mo
-share/locale/cs/LC_MESSAGES/gnome-volume-manager.mo
-share/locale/cy/LC_MESSAGES/gnome-volume-manager.mo
-share/locale/da/LC_MESSAGES/gnome-volume-manager.mo
-share/locale/de/LC_MESSAGES/gnome-volume-manager.mo
-share/locale/dz/LC_MESSAGES/gnome-volume-manager.mo
-share/locale/el/LC_MESSAGES/gnome-volume-manager.mo
-share/locale/en_CA/LC_MESSAGES/gnome-volume-manager.mo
-share/locale/en_GB/LC_MESSAGES/gnome-volume-manager.mo
-share/locale/es/LC_MESSAGES/gnome-volume-manager.mo
-share/locale/et/LC_MESSAGES/gnome-volume-manager.mo
-share/locale/eu/LC_MESSAGES/gnome-volume-manager.mo
-share/locale/fa/LC_MESSAGES/gnome-volume-manager.mo
-share/locale/fi/LC_MESSAGES/gnome-volume-manager.mo
-share/locale/fr/LC_MESSAGES/gnome-volume-manager.mo
-share/locale/gl/LC_MESSAGES/gnome-volume-manager.mo
-share/locale/gu/LC_MESSAGES/gnome-volume-manager.mo
-share/locale/he/LC_MESSAGES/gnome-volume-manager.mo
-share/locale/hi/LC_MESSAGES/gnome-volume-manager.mo
-share/locale/hr/LC_MESSAGES/gnome-volume-manager.mo
-share/locale/hu/LC_MESSAGES/gnome-volume-manager.mo
-share/locale/id/LC_MESSAGES/gnome-volume-manager.mo
-share/locale/is/LC_MESSAGES/gnome-volume-manager.mo
-share/locale/it/LC_MESSAGES/gnome-volume-manager.mo
-share/locale/ja/LC_MESSAGES/gnome-volume-manager.mo
-share/locale/ka/LC_MESSAGES/gnome-volume-manager.mo
-share/locale/ko/LC_MESSAGES/gnome-volume-manager.mo
-share/locale/ku/LC_MESSAGES/gnome-volume-manager.mo
-share/locale/lt/LC_MESSAGES/gnome-volume-manager.mo
-share/locale/lv/LC_MESSAGES/gnome-volume-manager.mo
-share/locale/mg/LC_MESSAGES/gnome-volume-manager.mo
-share/locale/mk/LC_MESSAGES/gnome-volume-manager.mo
-share/locale/ml/LC_MESSAGES/gnome-volume-manager.mo
-share/locale/mn/LC_MESSAGES/gnome-volume-manager.mo
-share/locale/ms/LC_MESSAGES/gnome-volume-manager.mo
-share/locale/nb/LC_MESSAGES/gnome-volume-manager.mo
-share/locale/ne/LC_MESSAGES/gnome-volume-manager.mo
-share/locale/nl/LC_MESSAGES/gnome-volume-manager.mo
-share/locale/nn/LC_MESSAGES/gnome-volume-manager.mo
-share/locale/oc/LC_MESSAGES/gnome-volume-manager.mo
-share/locale/or/LC_MESSAGES/gnome-volume-manager.mo
-share/locale/pa/LC_MESSAGES/gnome-volume-manager.mo
-share/locale/pl/LC_MESSAGES/gnome-volume-manager.mo
-share/locale/pt/LC_MESSAGES/gnome-volume-manager.mo
-share/locale/pt_BR/LC_MESSAGES/gnome-volume-manager.mo
-share/locale/ro/LC_MESSAGES/gnome-volume-manager.mo
-share/locale/ru/LC_MESSAGES/gnome-volume-manager.mo
-share/locale/rw/LC_MESSAGES/gnome-volume-manager.mo
-share/locale/si/LC_MESSAGES/gnome-volume-manager.mo
-share/locale/sk/LC_MESSAGES/gnome-volume-manager.mo
-share/locale/sl/LC_MESSAGES/gnome-volume-manager.mo
-share/locale/sq/LC_MESSAGES/gnome-volume-manager.mo
-share/locale/sr/LC_MESSAGES/gnome-volume-manager.mo
-share/locale/sr@Latn/LC_MESSAGES/gnome-volume-manager.mo
-share/locale/sv/LC_MESSAGES/gnome-volume-manager.mo
-share/locale/ta/LC_MESSAGES/gnome-volume-manager.mo
-share/locale/te/LC_MESSAGES/gnome-volume-manager.mo
-share/locale/th/LC_MESSAGES/gnome-volume-manager.mo
-share/locale/tr/LC_MESSAGES/gnome-volume-manager.mo
-share/locale/uk/LC_MESSAGES/gnome-volume-manager.mo
-share/locale/vi/LC_MESSAGES/gnome-volume-manager.mo
-share/locale/xh/LC_MESSAGES/gnome-volume-manager.mo
-share/locale/zh_CN/LC_MESSAGES/gnome-volume-manager.mo
-share/locale/zh_HK/LC_MESSAGES/gnome-volume-manager.mo
-share/locale/zh_TW/LC_MESSAGES/gnome-volume-manager.mo
-@dirrm %%DATADIR%%
-@dirrmtry share/applications
-@dirrmtry etc/xdg/autostart
-@dirrmtry etc/xdg
-@dirrmtry share/locale/zh_HK/LC_MESSAGES
-@dirrmtry share/locale/zh_HK
-@dirrmtry share/locale/xh/LC_MESSAGES
-@dirrmtry share/locale/xh
-@dirrmtry share/locale/te/LC_MESSAGES
-@dirrmtry share/locale/te
-@dirrmtry share/locale/si/LC_MESSAGES
-@dirrmtry share/locale/si
-@dirrmtry share/locale/rw/LC_MESSAGES
-@dirrmtry share/locale/rw
-@dirrmtry share/locale/oc/LC_MESSAGES
-@dirrmtry share/locale/oc
-@dirrmtry share/locale/mg/LC_MESSAGES
-@dirrmtry share/locale/mg
-@dirrmtry share/locale/ku/LC_MESSAGES
-@dirrmtry share/locale/ku
-@dirrmtry share/locale/dz/LC_MESSAGES
-@dirrmtry share/locale/dz
-@dirrmtry share/locale/bn_IN/LC_MESSAGES
-@dirrmtry share/locale/bn_IN
-@dirrmtry share/locale/be@latin/LC_MESSAGES
-@dirrmtry share/locale/be@latin
-@dirrmtry share/locale/ang/LC_MESSAGES
-@dirrmtry share/locale/ang
diff --git a/sysutils/gstreamer-plugins-hal/Makefile b/sysutils/gstreamer-plugins-hal/Makefile
deleted file mode 100644
index 28d30325c..000000000
--- a/sysutils/gstreamer-plugins-hal/Makefile
+++ /dev/null
@@ -1,18 +0,0 @@
-# New ports collection makefile for:	gstreamer-plugins-hal
-# Date created:			16 May 2006
-# Whom:				Michael Johnson <ahze@FreeBSD.org>
-#
-# $FreeBSD$
-#    $MCom: ports/sysutils/gstreamer-plugins-hal/Makefile,v 1.5 2008/03/15 21:09:37 ahze Exp $
-#
-
-PORTREVISION=	2
-CATEGORIES=	sysutils
-
-COMMENT=	Gstreamer hal plugin
-
-GST_PLUGIN=	hal
-
-MASTERDIR=	${.CURDIR}/../../multimedia/gstreamer-plugins
-
-.include "${MASTERDIR}/Makefile"
diff --git a/sysutils/hal-info/Makefile b/sysutils/hal-info/Makefile
deleted file mode 100644
index a11366a07..000000000
--- a/sysutils/hal-info/Makefile
+++ /dev/null
@@ -1,28 +0,0 @@
-# New ports collection makefile for:   hal-info
-# Date Created:			25 January 2008
-# Whom:				Joe Marcus Clarke <marcus@FreeBSD.org>
-#
-# $FreeBSD$
-#   $MCom: ports/sysutils/hal-info/Makefile,v 1.2 2008/03/15 18:38:57 marcus Exp $
-#
-
-PORTNAME=	hal-info
-PORTVERSION=	20080317
-CATEGORIES=	sysutils
-MASTER_SITES=	http://hal.freedesktop.org/releases/
-
-MAINTAINER=	gnome@FreeBSD.org
-COMMENT=	Additional FDI files to further classify HAL devices
-
-LIB_PC_DEPENDS=	hal.pc:${PORTSDIR}/sysutils/hal
-
-BUILD_DEPENDS+=	${LIB_PC_DEPENDS:C|^|${LOCALBASE}/libdata/pkgconfig/|g}
-RUN_DEPENDS+=	${LIB_PC_DEPENDS:C|^|${LOCALBASE}/libdata/pkgconfig/|g}
-
-USE_GMAKE=	yes
-USE_GNOME=	gnomehack gnometarget
-GNU_CONFIGURE=	yes
-CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" \
-		LDFLAGS="-L${LOCALBASE}/lib"
-
-.include <bsd.port.mk>
diff --git a/sysutils/hal-info/distinfo b/sysutils/hal-info/distinfo
deleted file mode 100644
index a058eaa17..000000000
--- a/sysutils/hal-info/distinfo
+++ /dev/null
@@ -1,3 +0,0 @@
-MD5 (hal-info-20080317.tar.gz) = 4cde7ff94f660879c44da17eb525edfd
-SHA256 (hal-info-20080317.tar.gz) = b6e3c45cb7929ed66eb154f28b7f89b6e36a9a6645a37f583f8b7c7e29322405
-SIZE (hal-info-20080317.tar.gz) = 184704
diff --git a/sysutils/hal-info/files/patch-configure b/sysutils/hal-info/files/patch-configure
deleted file mode 100644
index 0a7007324..000000000
--- a/sysutils/hal-info/files/patch-configure
+++ /dev/null
@@ -1,83 +0,0 @@
---- configure.orig	2008-03-17 18:27:34.000000000 -0400
-+++ configure	2008-03-17 18:28:11.000000000 -0400
-@@ -3436,7 +3436,7 @@ else
-   enable_recall=yes
- fi
- 
-- if test x$enable_recall == xyes; then
-+ if test x$enable_recall = xyes; then
-   BUILD_RECALL_TRUE=
-   BUILD_RECALL_FALSE='#'
- else
-@@ -3452,7 +3452,7 @@ else
-   enable_video=yes
- fi
- 
-- if test x$enable_video == xyes; then
-+ if test x$enable_video = xyes; then
-   BUILD_VIDEO_TRUE=
-   BUILD_VIDEO_FALSE='#'
- else
-@@ -3468,7 +3468,7 @@ else
-   enable_keymaps=yes
- fi
- 
-- if test x$enable_keymaps == xyes; then
-+ if test x$enable_keymaps = xyes; then
-   BUILD_KEYMAPS_TRUE=
-   BUILD_KEYMAPS_FALSE='#'
- else
-@@ -3484,7 +3484,7 @@ else
-   enable_killswitch_dell_wlan=yes
- fi
- 
-- if test x$enable_killswitch_dell_wlan == xyes; then
-+ if test x$enable_killswitch_dell_wlan = xyes; then
-   BUILD_KILLSWITCH_DELL_WLAN_TRUE=
-   BUILD_KILLSWITCH_DELL_WLAN_FALSE='#'
- else
-@@ -3500,7 +3500,7 @@ else
-   enable_killswitch_dell_bluetooth=yes
- fi
- 
-- if test x$enable_killswitch_dell_bluetooth == xyes; then
-+ if test x$enable_killswitch_dell_bluetooth = xyes; then
-   BUILD_KILLSWITCH_DELL_BLUETOOTH_TRUE=
-   BUILD_KILLSWITCH_DELL_BLUETOOTH_FALSE='#'
- else
-@@ -3516,7 +3516,7 @@ else
-   enable_killswitch_dell_wwan=yes
- fi
- 
-- if test x$enable_killswitch_dell_wwan == xyes; then
-+ if test x$enable_killswitch_dell_wwan = xyes; then
-   BUILD_KILLSWITCH_DELL_WWAN_TRUE=
-   BUILD_KILLSWITCH_DELL_WWAN_FALSE='#'
- else
-@@ -3532,7 +3532,7 @@ else
-   enable_killswitch_sony_bluetooth=yes
- fi
- 
-- if test x$enable_killswitch_sony_bluetooth == xyes; then
-+ if test x$enable_killswitch_sony_bluetooth = xyes; then
-   BUILD_KILLSWITCH_SONY_BLUETOOTH_TRUE=
-   BUILD_KILLSWITCH_SONY_BLUETOOTH_FALSE='#'
- else
-@@ -3548,7 +3548,7 @@ else
-   enable_killswitch_thinkpad_bluetooth=yes
- fi
- 
-- if test x$enable_killswitch_thinkpad_bluetooth == xyes; then
-+ if test x$enable_killswitch_thinkpad_bluetooth = xyes; then
-   BUILD_KILLSWITCH_THINKPAD_BLUETOOTH_TRUE=
-   BUILD_KILLSWITCH_THINKPAD_BLUETOOTH_FALSE='#'
- else
-@@ -3564,7 +3564,7 @@ else
-   enable_killswitch_ipw_wlan=yes
- fi
- 
-- if test x$enable_killswitch_ipw_wlan == xyes; then
-+ if test x$enable_killswitch_ipw_wlan = xyes; then
-   BUILD_KILLSWITCH_IPW_WLAN_TRUE=
-   BUILD_KILLSWITCH_IPW_WLAN_FALSE='#'
- else
diff --git a/sysutils/hal-info/pkg-descr b/sysutils/hal-info/pkg-descr
deleted file mode 100644
index dd42292fc..000000000
--- a/sysutils/hal-info/pkg-descr
+++ /dev/null
@@ -1,3 +0,0 @@
-hal-info contains device information for HAL.
-
-WWW: http://www.freedesktop.org/Software/hal
diff --git a/sysutils/hal-info/pkg-plist b/sysutils/hal-info/pkg-plist
deleted file mode 100644
index b48a5514f..000000000
--- a/sysutils/hal-info/pkg-plist
+++ /dev/null
@@ -1,44 +0,0 @@
-share/hal/fdi/information/10freedesktop/10-camera-ptp.fdi
-share/hal/fdi/information/10freedesktop/10-cd-dvd-burner.fdi
-share/hal/fdi/information/10freedesktop/10-dell-rfkill-switch-bluetooth.fdi
-share/hal/fdi/information/10freedesktop/10-dell-rfkill-switch-wlan.fdi
-share/hal/fdi/information/10freedesktop/10-dell-rfkill-switch-wwan.fdi
-share/hal/fdi/information/10freedesktop/10-ipw-rfkill-switch.fdi
-share/hal/fdi/information/10freedesktop/10-laptop-panel-hardware.fdi
-share/hal/fdi/information/10freedesktop/10-modem.fdi
-share/hal/fdi/information/10freedesktop/10-recall-battery-dell.fdi
-share/hal/fdi/information/10freedesktop/10-recall-battery-fujitsu.fdi
-share/hal/fdi/information/10freedesktop/10-recall-battery-gateway.fdi
-share/hal/fdi/information/10freedesktop/10-recall-battery-ibm.fdi
-share/hal/fdi/information/10freedesktop/10-recall-battery-lenovo.fdi
-share/hal/fdi/information/10freedesktop/10-recall-battery-toshiba.fdi
-share/hal/fdi/information/10freedesktop/10-sony-bluetooth-switch.fdi
-share/hal/fdi/information/10freedesktop/10-thinkpad-rfkill-switch-bluetooth.fdi
-share/hal/fdi/information/10freedesktop/10-usb-card-readers.fdi
-share/hal/fdi/information/10freedesktop/10-usb-music-players.fdi
-share/hal/fdi/information/10freedesktop/10-usb-pda.fdi
-share/hal/fdi/information/10freedesktop/10-usb-zip-drives.fdi
-share/hal/fdi/information/10freedesktop/10-usbcsr-mice.fdi
-share/hal/fdi/information/10freedesktop/20-video-quirk-pm-acer.fdi
-share/hal/fdi/information/10freedesktop/20-video-quirk-pm-apple.fdi
-share/hal/fdi/information/10freedesktop/20-video-quirk-pm-asus.fdi
-share/hal/fdi/information/10freedesktop/20-video-quirk-pm-dell.fdi
-share/hal/fdi/information/10freedesktop/20-video-quirk-pm-fujitsu.fdi
-share/hal/fdi/information/10freedesktop/20-video-quirk-pm-hp.fdi
-share/hal/fdi/information/10freedesktop/20-video-quirk-pm-ibm.fdi
-share/hal/fdi/information/10freedesktop/20-video-quirk-pm-lenovo.fdi
-share/hal/fdi/information/10freedesktop/20-video-quirk-pm-misc.fdi
-share/hal/fdi/information/10freedesktop/20-video-quirk-pm-samsung.fdi
-share/hal/fdi/information/10freedesktop/20-video-quirk-pm-sony.fdi
-share/hal/fdi/information/10freedesktop/20-video-quirk-pm-toshiba.fdi
-share/hal/fdi/information/10freedesktop/30-keymap-acer.fdi
-share/hal/fdi/information/10freedesktop/30-keymap-compaq.fdi
-share/hal/fdi/information/10freedesktop/30-keymap-dell.fdi
-share/hal/fdi/information/10freedesktop/30-keymap-hp.fdi
-share/hal/fdi/information/10freedesktop/30-keymap-lenovo.fdi
-share/hal/fdi/information/10freedesktop/30-keymap-misc.fdi
-share/hal/fdi/information/10freedesktop/30-keymap-module-asus-laptop.fdi
-share/hal/fdi/information/10freedesktop/30-keymap-module-sony-laptop.fdi
-share/hal/fdi/information/10freedesktop/30-keymap-module-thinkpad-acpi.fdi
-share/hal/fdi/preprobe/10osvendor/10-ide-drives.fdi
-share/hal/fdi/preprobe/10osvendor/20-broken-usb-sticks.fdi
diff --git a/sysutils/hal/Makefile b/sysutils/hal/Makefile
deleted file mode 100644
index ed9b51962..000000000
--- a/sysutils/hal/Makefile
+++ /dev/null
@@ -1,116 +0,0 @@
-# New ports collection makefile for:   HAL
-# Date Created:			02 May 2006
-# Whom:				Joe Marcus Clarke <marcus@FreeBSD.org>
-#
-# $FreeBSD$
-#   $MCom: ports/sysutils/hal/Makefile,v 1.42 2008/03/18 20:05:55 marcus Exp $
-#
-
-PORTNAME=	hal
-DISTVERSION=	0.5.11rc2
-PORTREVISION=	3
-CATEGORIES=	sysutils
-MASTER_SITES=	http://hal.freedesktop.org/releases/
-
-MAINTAINER=	gnome@FreeBSD.org
-COMMENT=	Hardware Abstraction Layer for simplifying device access
-
-LIB_DEPENDS=	polkit.2:${PORTSDIR}/sysutils/policykit \
-		volume_id.0:${PORTSDIR}/devel/libvolume_id \
-		ck-connector.0:${PORTSDIR}/sysutils/consolekit
-RUN_DEPENDS=	${LOCALBASE}/share/pciids/pci.ids:${PORTSDIR}/misc/pciids
-
-USE_GETTEXT=	yes
-USE_GMAKE=	yes
-USE_GNOME=	gnomehack gnometarget intlhack ltverhack
-USE_AUTOTOOLS=	libtool:15
-USE_LDCONFIG=	yes
-USE_PYTHON=	yes
-CONFIGURE_ARGS=	--disable-gtk-doc \
-		--with-backend=freebsd \
-		--disable-docbook-docs \
-		--with-pci-ids=${LOCALBASE}/share/pciids \
-		--disable-usb-ids \
-		--without-libpci \
-		--disable-usb \
-		--disable-smbios \
-		--disable-apm \
-		--disable-pmu \
-		--enable-policy-kit \
-		--enable-console-kit \
-		--with-socket-dir=/var/run/hald \
-		--with-eject=/usr/sbin/cdcontrol \
-		--with-pid-file=/var/run/hald/hald.pid \
-		--with-deprecated-keys \
-		--localstatedir=/var
-CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" \
-		LDFLAGS="-L${LOCALBASE}/lib" \
-		GTKDOC="false"
-
-#HALVERSION=	0.5.10
-#SNAPVERSION=	20080218
-
-USE_RC_SUBR=	hald
-USE_GNOME_SUBR=	yes
-DOCSDIR=	${PREFIX}/share/doc/${PORTNAME}-${HALVERSION}
-PLIST_SUB=	VERSION=${HALVERSION}
-
-RC_FILES=	hal.conf:${PREFIX}/etc/dbus-1/system.d
-PLIST_FILES=	${PRIV_FILES:S|^|%%DATADIR%%/dist/|}
-
-SUB_FILES=	pkg-install pkg-deinstall
-SUB_LIST=	RC_FILES="${RC_FILES}"
-
-MAN1=		hal-disable-polling.1 hal-find-by-capability.1 \
-		hal-find-by-property.1 hal-get-property.1 \
-		hal-is-caller-locked-out.1 hal-is-caller-privileged.1 \
-		hal-lock.1 hal-set-property.1 lshal.1
-MAN8=		hald.8
-
-OPTIONS=	FIXED_MOUNTPOINTS "use fixed mountpoints" off
-
-.include <bsd.port.pre.mk>
-
-.if ${OSVERSION} < 505000
-IGNORE=	not supported on FreeBSD prior to 5.5-RELEASE
-.endif
-
-.if (${ARCH}=="i386" || ${ARCH}=="amd64" || ${ARCH}=="ia64")
-RUN_DEPENDS+=	dmidecode:${PORTSDIR}/sysutils/dmidecode
-.endif
-
-.if ${OSVERSION} <= 601100
-NEEDS_MEDIA=	yes
-PLIST_SUB+=	MEDIA=""
-.else
-PLIST_SUB+=	MEDIA="@comment "
-.endif
-
-.if defined(WITH_FIXED_MOUNTPOINTS)
-EXTRA_PATCHES+=	${FILESDIR}/extra-patch-tools_hal-storage-mount.c
-.endif
-
-post-patch:
-	@${REINPLACE_CMD} -e '/^scriptdir = /s|libdir|libexecdir|' \
-		${WRKSRC}/tools/Makefile.in \
-		${WRKSRC}/tools/freebsd/Makefile.in
-	@${REINPLACE_CMD} -e 's|[(]libdir[)]/hal/scripts|(libexecdir)/hal/scripts|' \
-		${WRKSRC}/hald/Makefile.in
-	@${REINPLACE_CMD} -e 's|user="0"|group="operator"|g' \
-		${WRKSRC}/hal.conf.in
-
-post-install:
-	${MKDIR} ${DATADIR}/dist
-	${INSTALL_DATA} ${WRKSRC}/hal.conf ${DATADIR}/dist
-	@${SETENV} PKG_PREFIX=${PREFIX} PACKAGE_BUILDING=${PACKAGE_BUILDING} \
-		${SH} ${PKGINSTALL} ${PKGNAME} POST-INSTALL
-.if !defined(PACKAGE_BUILDING) && defined(NEEDS_MEDIA)
-	${MKDIR} /media
-.endif
-.if !defined(NOPORTDOCS)
-	${MKDIR} ${DOCSDIR}
-	${INSTALL_DATA} ${WRKSRC}/hald/freebsd/README \
-		${DOCSDIR}/README.freebsd
-.endif
-
-.include <bsd.port.post.mk>
diff --git a/sysutils/hal/distinfo b/sysutils/hal/distinfo
deleted file mode 100644
index 1c49bac64..000000000
--- a/sysutils/hal/distinfo
+++ /dev/null
@@ -1,3 +0,0 @@
-MD5 (hal-0.5.11rc2.tar.gz) = ade962044a62e8f2dc4625a17f4a5c7e
-SHA256 (hal-0.5.11rc2.tar.gz) = 3937d2ab06c091d0b5d604f7615096be505455448cc13635ebdba169d29b4bdc
-SIZE (hal-0.5.11rc2.tar.gz) = 1665175
diff --git a/sysutils/hal/files/extra-patch-tools_hal-storage-mount.c b/sysutils/hal/files/extra-patch-tools_hal-storage-mount.c
deleted file mode 100644
index 82a7fb607..000000000
--- a/sysutils/hal/files/extra-patch-tools_hal-storage-mount.c
+++ /dev/null
@@ -1,30 +0,0 @@
---- tools/hal-storage-mount.c.orig	2008-01-03 21:10:54.000000000 -0500
-+++ tools/hal-storage-mount.c	2008-01-04 09:29:10.000000000 -0500
-@@ -583,23 +583,11 @@ handle_mount (LibHalContext *hal_ctx, 
- 		explicit_mount_point_given = FALSE;
- 		if (strlen (mount_point) == 0) {
- 			char *p;
--			const char *label;
-+			char *basename;
- 			
--			if (volume != NULL)
--				label = libhal_volume_get_label (volume);
--			else
--				label = NULL;
--			
--			if (label != NULL) {
--				/* best - use label */
--				g_strlcpy (mount_point, label, sizeof (mount_point));
--				
--				/* TODO: use drive type */
--				
--			} else {
--				/* fallback - use "disk" */
--				g_snprintf (mount_point, sizeof (mount_point), "%s", "disk");
--			}
-+			basename = g_path_get_basename (device);
-+			g_strlcpy (mount_point, basename, sizeof (mount_point));
-+			g_free (basename);
- 			
- 			/* sanitize computed mount point name, e.g. replace invalid chars with '-' */
- 			p = mount_point;
diff --git a/sysutils/hal/files/hald.in b/sysutils/hal/files/hald.in
deleted file mode 100644
index 7f8f2c659..000000000
--- a/sysutils/hal/files/hald.in
+++ /dev/null
@@ -1,79 +0,0 @@
-#!/bin/sh
-#
-# $FreeBSD$
-#
-# PROVIDE: hald
-# REQUIRE: DAEMON usbd devd dbus
-#
-# Add the following line to /etc/rc.conf to enable the HAL daemon:
-#
-# hald_enable="YES"
-#
-
-. %%RC_SUBR%%
-. %%GNOME_SUBR%%
-
-hald_enable=${hald_enable-${gnome_enable}}
-hald_flags=${hald_flags-""}
-
-name=hald
-rcvar=`set_rcvar`
-
-command="%%PREFIX%%/sbin/hald"
-pidfile="/var/run/${name}/${name}.pid"
-
-stop_postcmd="hald_postcmd"
-start_precmd="hald_precmd"
-start_cmd="hald_start"
-
-local_force_depend()
-{
-    _depend="$1"
-    if [ -f %%LOCALBASE%%/etc/rc.d/${_depend}.sh ]; then
-	_depend="${_depend}.sh"
-    fi
-
-    if ! %%LOCALBASE%%/etc/rc.d/${_depend} forcestatus 1>/dev/null 2>&1 &&
-       ! %%LOCALBASE%%/etc/rc.d/${_depend} forcestart; then
-       return 1
-   fi
-   return 0
-}
-
-hald_precmd()
-{
-    if ! checkyesno dbus_enable
-    then
-	local_force_depend dbus || return 1
-    fi
-
-    chmod 0755 /var/cache
-
-    mkdir -p $(dirname $pidfile)
-}
-
-hald_postcmd()
-{
-    rm -f $pidfile
-}
-
-hald_start()
-{
-    if ! checkyesno hald_enable ; then
-	return 0
-    fi
-    echo "Starting ${name}."
-
-    ( iter=0
-    while ! ps -axoargs | grep "^/usr/libexec/getty " | grep -qv grep >/dev/null 2>&1; do
-	if [ ${iter} -eq 60 ]; then
-	    break
-	fi
-	sleep 1
-	iter=$(expr ${iter} + 1)
-    done
-    ${command} ${hald_flags} ) &
-}
-
-load_rc_config ${name}
-run_rc_command "$1"
diff --git a/sysutils/hal/files/patch-Makefile.in b/sysutils/hal/files/patch-Makefile.in
deleted file mode 100644
index 17d23980f..000000000
--- a/sysutils/hal/files/patch-Makefile.in
+++ /dev/null
@@ -1,25 +0,0 @@
---- Makefile.in.orig	2008-01-03 21:28:32.000000000 -0500
-+++ Makefile.in	2008-01-03 21:29:15.000000000 -0500
-@@ -311,14 +311,14 @@ clean-libtool:
- distclean-libtool:
- 	-rm -f libtool
- install-dist_dbusDATA: $(dist_dbus_DATA)
--	@$(NORMAL_INSTALL)
--	test -z "$(dbusdir)" || $(MKDIR_P) "$(DESTDIR)$(dbusdir)"
--	@list='$(dist_dbus_DATA)'; for p in $$list; do \
--	  if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
--	  f=$(am__strip_dir) \
--	  echo " $(dist_dbusDATA_INSTALL) '$$d$$p' '$(DESTDIR)$(dbusdir)/$$f'"; \
--	  $(dist_dbusDATA_INSTALL) "$$d$$p" "$(DESTDIR)$(dbusdir)/$$f"; \
--	done
-+#	@$(NORMAL_INSTALL)
-+#	test -z "$(dbusdir)" || $(MKDIR_P) "$(DESTDIR)$(dbusdir)"
-+#	@list='$(dist_dbus_DATA)'; for p in $$list; do \
-+#	  if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
-+#	  f=$(am__strip_dir) \
-+#	  echo " $(dist_dbusDATA_INSTALL) '$$d$$p' '$(DESTDIR)$(dbusdir)/$$f'"; \
-+#	  $(dist_dbusDATA_INSTALL) "$$d$$p" "$(DESTDIR)$(dbusdir)/$$f"; \
-+#	done
- 
- uninstall-dist_dbusDATA:
- 	@$(NORMAL_UNINSTALL)
diff --git a/sysutils/hal/files/patch-doc_Makefile.in b/sysutils/hal/files/patch-doc_Makefile.in
deleted file mode 100644
index 9cd951720..000000000
--- a/sysutils/hal/files/patch-doc_Makefile.in
+++ /dev/null
@@ -1,11 +0,0 @@
---- doc/Makefile.in.orig	2008-01-03 21:41:19.000000000 -0500
-+++ doc/Makefile.in	2008-01-03 21:41:31.000000000 -0500
-@@ -203,7 +203,7 @@ target_alias = @target_alias@
- top_builddir = @top_builddir@
- top_srcdir = @top_srcdir@
- EXTRA_DIST = TODO
--SUBDIRS = api spec man
-+SUBDIRS = spec man
- MAINTAINERCLEANFILES = \
- 	*~			\
- 	Makefile.in
diff --git a/sysutils/hal/files/patch-hald_freebsd_addons_addon-storage.c b/sysutils/hal/files/patch-hald_freebsd_addons_addon-storage.c
deleted file mode 100644
index ebeeb072c..000000000
--- a/sysutils/hal/files/patch-hald_freebsd_addons_addon-storage.c
+++ /dev/null
@@ -1,135 +0,0 @@
---- hald/freebsd/addons/addon-storage.c.orig	2008-03-17 17:25:16.000000000 -0400
-+++ hald/freebsd/addons/addon-storage.c	2008-03-22 03:25:19.000000000 -0400
-@@ -150,6 +150,34 @@ hf_addon_storage_update (void)
-   return has_media;
- }
- 
-+static boolean
-+poll_for_media (void)
-+{
-+  boolean has_media;
-+
-+  has_media = hf_addon_storage_update();
-+  if (has_media != addon.had_media)
-+    {
-+      /*
-+       * FIXME: if the media was removed, we should force-unmount
-+       * all its child volumes (see linux2/addons/addon-storage.c).
-+       * However, currently (FreeBSD 6.0) umount -f is broken and
-+       * can cause kernel panics. When I tried to umount -f a
-+       * flash card after removing it, it failed with EAGAIN. It
-+       * continued to fail after I inserted the card. The system
-+       * then hung while rebooting and did not unmount my other
-+       * filesystems.
-+       */
-+
-+      libhal_device_rescan(hfp_ctx, hfp_udi, &hfp_error);
-+      dbus_error_free(&hfp_error);
-+      addon.had_media = has_media;
-+
-+      return TRUE;
-+    }
-+  return FALSE;
-+}
-+
- static void
- update_proc_title (const char *device, boolean polling_enabled)
- {
-@@ -159,6 +187,29 @@ update_proc_title (const char *device, b
-     setproctitle("no polling on %s because it is explicitly disabled", device);
- }
- 
-+static DBusHandlerResult
-+filter_function (DBusConnection *connection, DBusMessage *message, void *user_data)
-+{
-+  if (dbus_message_is_method_call(message,
-+			  	  "org.freedesktop.Hal.Device.Storage.Removable",
-+				  "CheckForMedia"))
-+    {
-+      DBusMessage *reply;
-+      dbus_bool_t had_effect;
-+
-+      hfp_info("Forcing poll for media becusse CheckForMedia() was called");
-+
-+      had_effect = poll_for_media();
-+
-+      reply = dbus_message_new_method_return (message);
-+      dbus_message_append_args(reply, DBUS_TYPE_BOOLEAN, &had_effect, DBUS_TYPE_INVALID);
-+      dbus_connection_send(connection, reply, NULL);
-+      dbus_message_unref(reply);
-+    }
-+
-+  return DBUS_HANDLER_RESULT_HANDLED;
-+}
-+
- int
- main (int argc, char **argv)
- {
-@@ -202,13 +253,30 @@ main (int argc, char **argv)
-     ! strcmp(driver, "cd")))) && ! strcmp(removable, "true");
-   addon.had_media = hf_addon_storage_update();
- 
-+  if (! libhal_device_addon_is_ready(hfp_ctx, hfp_udi, &hfp_error))
-+    goto end;
-+  dbus_error_free(&hfp_error);
-+
-   connection = libhal_ctx_get_dbus_connection(hfp_ctx);
-   assert(connection != NULL);
-+  dbus_connection_set_exit_on_disconnect(connection, 0);
-+  dbus_connection_add_filter(connection, filter_function, NULL, NULL);
- 
--  while (TRUE)
-+  if (! libhal_device_claim_interface(hfp_ctx,
-+			 	      hfp_udi,
-+				      "org.freedesktop.Hal.Device.Storage.Removable",
-+				      "    <method name=\"CheckForMedia\">\n"
-+				      "      <arg name=\"call_had_sideeffect\" direction=\"out\" type=\"b\"/>\n"
-+				      "    </method>\n",
-+				      &hfp_error))
-     {
--      boolean has_media;
-+      hfp_critical("Cannot claim interface 'org.freedesktop.Hal.Device.Storage.Removable'");
-+      goto end;
-+    }
-+  dbus_error_free(&hfp_error);
- 
-+  while (TRUE)
-+    {
-       /* process dbus traffic until update interval has elapsed */
-       while (TRUE)
- 	{
-@@ -225,7 +293,7 @@ main (int argc, char **argv)
- 	      if (timeout.tv_sec < 0) /* current time went backwards */
- 		timeout = addon.update_interval;
- 
--	      dbus_connection_read_write(connection, timeout.tv_sec * 1000 + timeout.tv_usec / 1000);
-+	      dbus_connection_read_write_dispatch(connection, timeout.tv_sec * 1000 + timeout.tv_usec / 1000);
- 	      if (! dbus_connection_get_is_connected(connection))
- 		goto end;
- 	    }
-@@ -239,24 +307,7 @@ main (int argc, char **argv)
- 
-       if (should_poll)
-         {
--          has_media = hf_addon_storage_update();
--          if (has_media != addon.had_media)
--	    {
--	      /*
--	       * FIXME: if the media was removed, we should force-unmount
--	       * all its child volumes (see linux2/addons/addon-storage.c).
--	       * However, currently (FreeBSD 6.0) umount -f is broken and
--	       * can cause kernel panics. When I tried to umount -f a
--	       * flash card after removing it, it failed with EAGAIN. It
--	       * continued to fail after I inserted the card. The system
--	       * then hung while rebooting and did not unmount my other
--	       * filesystems.
--	       */
--
--	      libhal_device_rescan(hfp_ctx, hfp_udi, &hfp_error);
--	      dbus_error_free(&hfp_error);
--	      addon.had_media = has_media;
--	    }
-+          poll_for_media();
-         }
-       else
-         {
diff --git a/sysutils/hal/files/patch-hald_freebsd_hf-scsi.c b/sysutils/hal/files/patch-hald_freebsd_hf-scsi.c
deleted file mode 100644
index 598ac6283..000000000
--- a/sysutils/hal/files/patch-hald_freebsd_hf-scsi.c
+++ /dev/null
@@ -1,12 +0,0 @@
---- hald/freebsd/hf-scsi.c.orig	2008-03-18 15:58:59.000000000 -0400
-+++ hald/freebsd/hf-scsi.c	2008-03-18 15:57:36.000000000 -0400
-@@ -409,8 +409,8 @@ hf_scsi_handle_pending_device (struct de
- 		   */
- 		  hf_block_device_complete(block_device, block_device, FALSE);
- 
--		  hf_storage_device_probe(block_device, FALSE);
- 		  hf_device_add(block_device);
-+		  hf_storage_device_probe(block_device, FALSE);
- 		}
- 	    }
- 	}
diff --git a/sysutils/hal/files/pkg-deinstall.in b/sysutils/hal/files/pkg-deinstall.in
deleted file mode 100644
index 96f8e9f91..000000000
--- a/sysutils/hal/files/pkg-deinstall.in
+++ /dev/null
@@ -1,12 +0,0 @@
-#!/bin/sh
-
-[ "$2" != DEINSTALL ] && exit 0
-
-for pair in %%RC_FILES%%; do
-	file=`echo $pair | cut -f 1 -d :`
-	destdir=`echo $pair | cut -f 2 -d :`
-
-	if cmp -s %%DATADIR%%/dist/$file $destdir/$file; then
-		rm -f $destdir/$file
-	fi
-done
diff --git a/sysutils/hal/files/pkg-install.in b/sysutils/hal/files/pkg-install.in
deleted file mode 100644
index 72b67ff95..000000000
--- a/sysutils/hal/files/pkg-install.in
+++ /dev/null
@@ -1,49 +0,0 @@
-#!/bin/sh
-
-[ "$2" != POST-INSTALL ] && exit 0
-
-if [ -z "${PACKAGE_BUILDING}" ]; then
-	USER=haldaemon
-	GROUP=${USER}
-	UID=560
-	GID=${UID}
-	PW=/usr/sbin/pw
-
-	if ${PW} group show "${GROUP}" 2>/dev/null; then
-		echo "You already have a group \"${GROUP}\", so I will use it."
-	else
-		if ${PW} groupadd ${GROUP} -g ${GID}; then
-			echo "Added group \"${GROUP}\"."
-		else
-			echo "Adding group \"${GROUP}\" failed..."
-			exit 1
-		fi
-	fi
-
-	if ${PW} user show "${USER}" 2>/dev/null; then
-		echo "You already have a user \"${USER}\", so I will use it."
-	else
-		if ${PW} useradd ${USER} -u ${UID} -g ${GROUP} -h - \
-			-d "/nonexistent" -s /sbin/nologin -c "HAL Daemon User"
-		then
-			echo "Added user \"${USER}\"."
-		else
-			echo "Adding user \"${USER}\" failed..."
-			exit 1
-		fi
-	fi
-
-	/usr/bin/install -d -o ${USER} -g ${GROUP} /var/run/hald
-	/usr/bin/install -d -o ${USER} -g ${GROUP} /var/cache/hald
-	/usr/bin/install -d -o ${USER} -g ${GROUP} /var/lib/hal
-fi
-
-for pair in %%RC_FILES%%; do
-	file=`echo $pair | cut -f 1 -d :`
-	destdir=`echo $pair | cut -f 2 -d :`
-
-	if [ ! -f $destdir/$file ]; then
-	    	mkdir -p $destdir
-		cp -p %%DATADIR%%/dist/$file $destdir/$file
-	fi
-done
diff --git a/sysutils/hal/pkg-descr b/sysutils/hal/pkg-descr
deleted file mode 100644
index c94358513..000000000
--- a/sysutils/hal/pkg-descr
+++ /dev/null
@@ -1,6 +0,0 @@
-HAL is a hardware abstraction layer whose goal is to merge information from
-various sources such that desktop applications can locate and use hardware
-devices. The point is that the exact set of information to merge varies by
-device and bus type.
-
-WWW: http://www.freedesktop.org/Software/hal
diff --git a/sysutils/hal/pkg-plist b/sysutils/hal/pkg-plist
deleted file mode 100644
index 3b60cfa41..000000000
--- a/sysutils/hal/pkg-plist
+++ /dev/null
@@ -1,126 +0,0 @@
-@unexec %D/etc/rc.d/hald stop > /dev/null 2>&1 || true
-%%MEDIA%%@exec mkdir -p /media
-bin/hal-device
-bin/hal-disable-polling
-bin/hal-find-by-capability
-bin/hal-find-by-property
-bin/hal-get-property
-bin/hal-is-caller-locked-out
-bin/hal-is-caller-privileged
-bin/hal-lock
-bin/hal-set-property
-bin/lshal
-@exec mkdir -p %D/etc/hal/fdi/preprobe
-@exec mkdir -p %D/etc/hal/fdi/policy
-@exec mkdir -p %D/etc/hal/fdi/information
-include/hal/libhal-storage.h
-include/hal/libhal.h
-lib/libhal-storage.a
-lib/libhal-storage.la
-lib/libhal-storage.so
-lib/libhal-storage.so.1
-lib/libhal.a
-lib/libhal.la
-lib/libhal.so
-lib/libhal.so.1
-lib/libhald_freebsd_probe.a
-lib/libhald_freebsd_probe.la
-lib/libhald_freebsd_probe.so
-lib/libhald_freebsd_probe.so.0
-libdata/pkgconfig/hal-storage.pc
-libdata/pkgconfig/hal.pc
-libexec/hal-storage-cleanup-all-mountpoints
-libexec/hal-storage-cleanup-mountpoint
-libexec/hal-storage-closetray
-libexec/hal-storage-eject
-libexec/hal-storage-mount
-libexec/hal-storage-unmount
-libexec/hal-system-power-pm-is-supported
-libexec/hal-system-setserial
-libexec/hal/scripts/freebsd/hal-system-lcd-get-brightness-freebsd
-libexec/hal/scripts/freebsd/hal-system-lcd-set-brightness-freebsd
-libexec/hal/scripts/freebsd/hal-system-power-reboot-freebsd
-libexec/hal/scripts/freebsd/hal-system-power-set-power-save-freebsd
-libexec/hal/scripts/freebsd/hal-system-power-shutdown-freebsd
-libexec/hal/scripts/freebsd/hal-system-power-suspend-freebsd
-libexec/hal/scripts/hal-dockstation-undock
-libexec/hal/scripts/hal-functions
-libexec/hal/scripts/hal-luks-remove
-libexec/hal/scripts/hal-luks-setup
-libexec/hal/scripts/hal-luks-teardown
-libexec/hal/scripts/hal-system-killswitch-get-power
-libexec/hal/scripts/hal-system-killswitch-set-power
-libexec/hal/scripts/hal-system-lcd-get-brightness
-libexec/hal/scripts/hal-system-lcd-set-brightness
-libexec/hal/scripts/hal-system-power-hibernate
-libexec/hal/scripts/hal-system-power-reboot
-libexec/hal/scripts/hal-system-power-set-power-save
-libexec/hal/scripts/hal-system-power-shutdown
-libexec/hal/scripts/hal-system-power-suspend
-libexec/hal/scripts/hal-system-power-suspend-hybrid
-libexec/hal/scripts/hal-system-wol-enable
-libexec/hal/scripts/hal-system-wol-enabled
-libexec/hal/scripts/hal-system-wol-supported
-libexec/hald-addon-storage
-libexec/hald-generate-fdi-cache
-libexec/hald-probe-hiddev
-libexec/hald-probe-scsi
-libexec/hald-probe-smbios
-libexec/hald-probe-storage
-libexec/hald-probe-volume
-libexec/hald-runner
-sbin/hald
-%%PORTDOCS%%%%DOCSDIR%%/README.freebsd
-%%DATADIR%%/dist/hal.conf
-%%DATADIR%%/fdi/fdi.dtd
-%%DATADIR%%/fdi/information/10freedesktop/01-deprecated-keys.fdi
-@exec mkdir -p %D/%%DATADIR%%/fdi/information/20thirdparty
-%%DATADIR%%/fdi/policy/10osvendor/10-dockstation.fdi
-%%DATADIR%%/fdi/policy/10osvendor/10-input-policy.fdi
-%%DATADIR%%/fdi/policy/10osvendor/10-laptop-panel-mgmt-policy.fdi
-%%DATADIR%%/fdi/policy/10osvendor/10-power-mgmt-policy.fdi
-%%DATADIR%%/fdi/policy/10osvendor/10-rfkill-switch.fdi
-%%DATADIR%%/fdi/policy/10osvendor/10-tabletPCs.fdi
-%%DATADIR%%/fdi/policy/10osvendor/10-x11-input.fdi
-%%DATADIR%%/fdi/policy/10osvendor/15-storage-luks.fdi
-%%DATADIR%%/fdi/policy/10osvendor/20-storage-methods.fdi
-%%DATADIR%%/fdi/policy/10osvendor/30-wol.fdi
-share/PolicyKit/policy/org.freedesktop.hal.dockstation.policy
-share/PolicyKit/policy/org.freedesktop.hal.killswitch.policy
-share/PolicyKit/policy/org.freedesktop.hal.policy
-share/PolicyKit/policy/org.freedesktop.hal.power-management.policy
-share/PolicyKit/policy/org.freedesktop.hal.storage.policy
-share/PolicyKit/policy/org.freedesktop.hal.wol.policy
-@exec mkdir -p %D/%%DATADIR%%/fdi/policy/20thirdparty
-@exec mkdir -p %D/%%DATADIR%%/fdi/preprobe/20thirdparty
-@dirrm %%DATADIR%%/fdi/preprobe/20thirdparty
-@dirrm %%DATADIR%%/fdi/preprobe/10osvendor
-@dirrm %%DATADIR%%/fdi/preprobe
-@dirrm %%DATADIR%%/fdi/policy/20thirdparty
-@dirrm %%DATADIR%%/fdi/policy/10osvendor
-@dirrm %%DATADIR%%/fdi/policy
-@dirrm %%DATADIR%%/fdi/information/20thirdparty
-@dirrm %%DATADIR%%/fdi/information/10freedesktop
-@dirrm %%DATADIR%%/fdi/information
-@dirrm %%DATADIR%%/fdi
-@dirrm %%DATADIR%%/dist
-@dirrm %%DATADIR%%
-@dirrm %%DOCSDIR%%
-@dirrm libexec/hal/scripts/freebsd
-@dirrm libexec/hal/scripts
-@dirrm libexec/hal
-@dirrm include/hal
-@dirrm etc/hal/fdi/preprobe
-@dirrm etc/hal/fdi/policy
-@dirrm etc/hal/fdi/information
-@dirrm etc/hal/fdi
-@dirrm etc/hal
-@unexec rm -f /var/run/hald/hald.pid 2>/dev/null || true
-@unexec rm -rf /var/run/hald/hald-local 2>/dev/null || true
-@unexec rm -rf /var/run/hald/hald-runner 2>/dev/null || true
-@unexec rmdir /var/run/hald 2>/dev/null || true
-@unexec rmdir /var/cache/hald 2>/dev/null || true
-@unexec rmdir /var/cache 2>/dev/null || true
-@unexec /var/lib/hal 2>/dev/null || true
-@unexec /var/lib 2>/dev/null || true
-%%MEDIA%%@unexec rmdir /media 2>/dev/null || true
diff --git a/sysutils/nautilus-cd-burner/Makefile b/sysutils/nautilus-cd-burner/Makefile
deleted file mode 100644
index 9f57584bc..000000000
--- a/sysutils/nautilus-cd-burner/Makefile
+++ /dev/null
@@ -1,57 +0,0 @@
-# New ports collection makefile for:	nautilus-cd-burner
-# Date created:				13 April 2003
-# Whom:					Joe Marcus Clarke <marcus@FreeBSD.org>
-#
-# $FreeBSD$
-#   $MCom: ports/sysutils/nautilus-cd-burner/Makefile,v 1.140 2008/03/11 03:27:33 mezz Exp $
-#
-
-PORTNAME=	nautilus-cd-burner
-PORTVERSION=	2.22.0
-PORTREVISION=	1
-CATEGORIES=	sysutils gnome
-MASTER_SITES=	GNOME
-DIST_SUBDIR=	gnome2
-
-MAINTAINER=	gnome@FreeBSD.org
-COMMENT=	CD burner view for Nautilus
-
-BUILD_DEPENDS=	gnome-mount:${PORTSDIR}/sysutils/gnome-mount
-RUN_DEPENDS=	gnome-mount:${PORTSDIR}/sysutils/gnome-mount \
-		cdrdao:${PORTSDIR}/sysutils/cdrdao
-
-CONFIGURE_ARGS=	--enable-gnome-mount
-USE_BZIP2=	yes
-USE_GETTEXT=	yes
-USE_XLIB=	yes
-USE_GMAKE=	yes
-GNOME_DESKTOP_VERSION=2
-USE_GNOME=	gnomeprefix gnomehack intlhack nautilus2 ltverhack \
-		desktopfileutils ltasneededhack
-USE_CDRTOOLS=	yes
-INSTALLS_ICONS=	yes
-USE_AUTOTOOLS=	libtool:15
-USE_LDCONFIG=	yes
-CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" \
-		LDFLAGS="-L${LOCALBASE}/lib"
-
-GCONF_SCHEMAS=	nautilus-cd-burner.schemas
-
-OPTIONS=	DVD "Enable DVD support" on \
-		CJK "Use cdrtools-cjk instead of cdrtools" off
-
-.include <bsd.port.pre.mk>
-
-.if defined(WITH_CJK)
-WITHOUT_DVD=	yes
-.endif
-
-.if !defined(WITHOUT_DVD)
-RUN_DEPENDS+=	growisofs:${PORTSDIR}/sysutils/dvd+rw-tools
-.endif
-
-post-install:
-	-@update-desktop-database
-	@${CAT} ${PKGMESSAGE}
-
-.include <bsd.port.post.mk>
diff --git a/sysutils/nautilus-cd-burner/distinfo b/sysutils/nautilus-cd-burner/distinfo
deleted file mode 100644
index 029d3fe5e..000000000
--- a/sysutils/nautilus-cd-burner/distinfo
+++ /dev/null
@@ -1,3 +0,0 @@
-MD5 (gnome2/nautilus-cd-burner-2.22.0.tar.bz2) = e75c61879a12ab329fd2f3081b7e5d76
-SHA256 (gnome2/nautilus-cd-burner-2.22.0.tar.bz2) = c8bc7d9211438e5f12c755226d953884bfdf16957084ec423dcf80f4acb4cd63
-SIZE (gnome2/nautilus-cd-burner-2.22.0.tar.bz2) = 734921
diff --git a/sysutils/nautilus-cd-burner/files/patch-configure b/sysutils/nautilus-cd-burner/files/patch-configure
deleted file mode 100644
index e8dbb4a5b..000000000
--- a/sysutils/nautilus-cd-burner/files/patch-configure
+++ /dev/null
@@ -1,27 +0,0 @@
---- configure.orig	Thu Jul 22 10:27:35 2004
-+++ configure	Thu Jul 22 10:29:32 2004
-@@ -21015,6 +21015,8 @@
- if eval "test \"\${$as_ac_var+set}\" = set"; then
-   echo $ECHO_N "(cached) $ECHO_C" >&6
- else
-+  ac_check_lib_save_LIBS=$LIBS
-+  LIBS="-lintl $LIBS"
-   cat >conftest.$ac_ext <<_ACEOF
- /* confdefs.h.  */
- _ACEOF
-@@ -21097,6 +21099,7 @@
- fi
- rm -f conftest.err conftest.$ac_objext \
-       conftest$ac_exeext conftest.$ac_ext
-+      LIBS=$ac_check_lib_save_LIBS
- fi
- echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_var'}'`" >&5
- echo "${ECHO_T}`eval echo '${'$as_ac_var'}'`" >&6
-@@ -21104,6 +21107,7 @@
-   cat >>confdefs.h <<_ACEOF
- #define `echo "HAVE_$ac_func" | $as_tr_cpp` 1
- _ACEOF
-+LIBS="-lintl $LIBS"
- 
- fi
- done
diff --git a/sysutils/nautilus-cd-burner/files/patch-src_list_cddrives.c b/sysutils/nautilus-cd-burner/files/patch-src_list_cddrives.c
deleted file mode 100644
index 71f43178c..000000000
--- a/sysutils/nautilus-cd-burner/files/patch-src_list_cddrives.c
+++ /dev/null
@@ -1,10 +0,0 @@
---- src/list_cddrives.c.orig	2008-01-21 11:14:45.000000000 -0500
-+++ src/list_cddrives.c	2008-01-21 19:48:49.000000000 -0500
-@@ -49,6 +49,7 @@ list_drive_info (NautilusBurnDrive *driv
-         g_print ("Drive:\n");
-         g_print ("  name:\t\t\t%s\n", display_name);
-         g_print ("  device:\t\t%s\n", nautilus_burn_drive_get_device (drive));
-+        g_print ("  cdrecord device:\t%s\n", nautilus_burn_drive_get_cdrecord_device (drive));
-         g_print ("  door:\t\t\t%s\n", door_is_open ? "open" : "closed");
-         g_print ("  type:\t\t\t%s\n", type_str);
-         g_print ("  is mounted:\t\t%s\n", is_mounted ? "TRUE" : "FALSE");
diff --git a/sysutils/nautilus-cd-burner/files/patch-src_make-iso.c b/sysutils/nautilus-cd-burner/files/patch-src_make-iso.c
deleted file mode 100644
index 18183a421..000000000
--- a/sysutils/nautilus-cd-burner/files/patch-src_make-iso.c
+++ /dev/null
@@ -1,38 +0,0 @@
---- src/make-iso.c.orig        Sun Nov 19 13:34:29 2006
-+++ src/make-iso.c        Sun Nov 19 13:36:03 2006
-@@ -1367,7 +1367,7 @@ get_disc_info (NautilusBurnIso   *iso,
-                                                               &has_data,
-                                                               &_has_audio);
-         if (_has_audio) {
--                device_arg = g_strdup_printf ("%s", nautilus_burn_drive_get_device (drive));
-+                device_arg = g_strdup_printf ("%s", nautilus_burn_drive_get_cdrecord_device (drive));
- 
-                 argv = g_ptr_array_new ();
-                 g_ptr_array_add (argv, "cdrdao");
-@@ -1377,7 +1377,7 @@ get_disc_info (NautilusBurnIso   *iso,
-                 g_ptr_array_add (argv, NULL);
- 
-         } else {
--                device_arg = g_strdup_printf ("-dev=%s", nautilus_burn_drive_get_device (drive));
-+                device_arg = g_strdup_printf ("-dev=%s", nautilus_burn_drive_get_cdrecord_device (drive));
- 
-                 argv = g_ptr_array_new ();
-                 g_ptr_array_add (argv, "readcd");
-@@ -1547,7 +1547,7 @@ nautilus_burn_iso_make_from_drive (Nauti
-                 g_ptr_array_add (argv, "--datafile");
-                 g_ptr_array_add (argv, (char *)filename);
-                 g_ptr_array_add (argv, "--device");
--                g_ptr_array_add (argv, (char *)nautilus_burn_drive_get_device (drive));
-+                g_ptr_array_add (argv, (char *)nautilus_burn_drive_get_cdrecord_device (drive));
-                 g_ptr_array_add (argv, "-v");
-                 g_ptr_array_add (argv, "2");
-                 g_ptr_array_add (argv, (char *)toc_filename_arg);
-@@ -1559,7 +1559,7 @@ nautilus_burn_iso_make_from_drive (Nauti
- 
-                 filename_arg = g_strdup_printf ("f=%s", filename);
- 
--                dev_arg = g_strdup_printf ("dev=%s", nautilus_burn_drive_get_device (drive));
-+                dev_arg = g_strdup_printf ("dev=%s", nautilus_burn_drive_get_cdrecord_device (drive));
- 
-                 argv = g_ptr_array_new ();
-                 g_ptr_array_add (argv, "readcd");
diff --git a/sysutils/nautilus-cd-burner/files/patch-src_nautilus-burn-drive-monitor.c b/sysutils/nautilus-cd-burner/files/patch-src_nautilus-burn-drive-monitor.c
deleted file mode 100644
index 2d6288663..000000000
--- a/sysutils/nautilus-cd-burner/files/patch-src_nautilus-burn-drive-monitor.c
+++ /dev/null
@@ -1,48 +0,0 @@
---- src/nautilus-burn-drive-monitor.c.orig        2007-07-10 15:06:23.000000000 -0400
-+++ src/nautilus-burn-drive-monitor.c        2008-01-05 13:51:44.000000000 -0500
-@@ -618,7 +618,8 @@ nautilus_burn_drive_monitor_get_drive_fo
-                  */
-                 if (drive->priv->device != NULL &&
-                    (strcmp (drive->priv->device, target) == 0 ||
--                    strcmp (drive->priv->device, device) == 0)) {
-+                    strcmp (drive->priv->device, device) == 0 ||
-+                    strcmp (drive->priv->cdrecord_device, device) == 0)) {
-                         ret = nautilus_burn_drive_ref (drive);
-                         break;
-                 }
-@@ -683,6 +684,8 @@ hal_drive_from_udi (LibHalContext *ctx,
-         NautilusBurnDrive        *drive;
-         char                    **write_speeds = NULL;
-         char                     *raw_device = NULL;
-+        char                     *cam_path = NULL;
-+        char                     *cam_device = NULL;
- 
-         LIBHAL_CHECK_LIBHALCONTEXT (ctx, FALSE);
- 
-@@ -711,6 +714,8 @@ hal_drive_from_udi (LibHalContext *ctx,
- 
-                 LIBHAL_PROP_EXTRACT_STRING  ("block.device",               drive->priv->device);
-                 LIBHAL_PROP_EXTRACT_STRING  ("block.solaris.raw_device",   raw_device);
-+                LIBHAL_PROP_EXTRACT_STRING  ("block.freebsd.atapi_cam_device", cam_device);
-+                LIBHAL_PROP_EXTRACT_STRING  ("block.freebsd.cam_path",     cam_path);
-                 LIBHAL_PROP_EXTRACT_STRING  ("storage.model",              drive->priv->display_name);
- 
-                 LIBHAL_PROP_EXTRACT_INT ("storage.cdrom.read_speed",   drive->priv->max_speed_read);
-@@ -736,6 +741,17 @@ hal_drive_from_udi (LibHalContext *ctx,
-                 drive->priv->device = raw_device;
-         }
- 
-+        if (cam_device != NULL) {
-+                g_free (drive->priv->device);
-+                drive->priv->device = cam_device;
-+        }
-+
-+        if (cam_path != NULL) {
-+                drive->priv->cdrecord_device = cam_path;
-+        } else {
-+                drive->priv->cdrecord_device = g_strdup (drive->priv->device);
-+        }
-+
-         drive->priv->drive_udi = g_strdup (udi);
-         drive->priv->write_speeds = hal_parse_write_speeds (write_speeds);
-         /* we do not own write_speeds so do not free it. */
diff --git a/sysutils/nautilus-cd-burner/files/patch-src_nautilus-burn-drive-private.h b/sysutils/nautilus-cd-burner/files/patch-src_nautilus-burn-drive-private.h
deleted file mode 100644
index a4da309cb..000000000
--- a/sysutils/nautilus-cd-burner/files/patch-src_nautilus-burn-drive-private.h
+++ /dev/null
@@ -1,10 +0,0 @@
---- src/nautilus-burn-drive-private.h.orig        Sun Nov 19 13:43:24 2006
-+++ src/nautilus-burn-drive-private.h        Sun Nov 19 13:43:50 2006
-@@ -34,6 +34,7 @@ struct NautilusBurnDrivePrivate {
- 
-         int                           type;
-         char                         *device;
-+        char                         *cdrecord_device;
-         char                         *display_name;
-         int                           max_speed_write;
-         int                           max_speed_read;
diff --git a/sysutils/nautilus-cd-burner/files/patch-src_nautilus-burn-drive-selection.c b/sysutils/nautilus-cd-burner/files/patch-src_nautilus-burn-drive-selection.c
deleted file mode 100644
index a3d5a2949..000000000
--- a/sysutils/nautilus-cd-burner/files/patch-src_nautilus-burn-drive-selection.c
+++ /dev/null
@@ -1,29 +0,0 @@
---- src/nautilus-burn-drive-selection.c.orig        Sun Nov 19 13:39:17 2006
-+++ src/nautilus-burn-drive-selection.c        Sun Nov 19 13:39:30 2006
-@@ -151,7 +151,7 @@ nautilus_burn_drive_selection_set_drive_
-                        0, drive);
-         g_signal_emit (G_OBJECT (selection),
-                        nautilus_burn_drive_selection_table_signals [DEVICE_CHANGED],
--                       0, nautilus_burn_drive_get_device (drive));
-+                       0, nautilus_burn_drive_get_cdrecord_device (drive));
- 
-         g_object_notify (G_OBJECT (selection), "device");
-         g_object_notify (G_OBJECT (selection), "drive");
-@@ -584,7 +584,7 @@ nautilus_burn_drive_selection_get_defaul
-         if (drives == NULL) {
-                 device = "/dev/cdrom";
-         } else {
--                device = nautilus_burn_drive_get_device (drives->data);
-+                device = nautilus_burn_drive_get_cdrecord_device (drives->data);
-                 g_list_foreach (drives, (GFunc)nautilus_burn_drive_unref, NULL);
-                 g_list_free (drives);
-         }
-@@ -633,7 +633,7 @@ nautilus_burn_drive_selection_get_device
-         g_return_val_if_fail (selection != NULL, NULL);
-         g_return_val_if_fail (NAUTILUS_BURN_IS_DRIVE_SELECTION (selection), NULL);
- 
--        return selection->priv->selected_drive != NULL ? nautilus_burn_drive_get_device (selection->priv->selected_drive) : NULL;
-+        return selection->priv->selected_drive != NULL ? nautilus_burn_drive_get_cdrecord_device (selection->priv->selected_drive) : NULL;
- }
- 
- /**
diff --git a/sysutils/nautilus-cd-burner/files/patch-src_nautilus-burn-drive.c b/sysutils/nautilus-cd-burner/files/patch-src_nautilus-burn-drive.c
deleted file mode 100644
index 17a038446..000000000
--- a/sysutils/nautilus-cd-burner/files/patch-src_nautilus-burn-drive.c
+++ /dev/null
@@ -1,44 +0,0 @@
---- src/nautilus-burn-drive.c.orig        Fri Sep 29 12:55:36 2006
-+++ src/nautilus-burn-drive.c        Sun Nov 19 13:27:31 2006
-@@ -266,6 +266,25 @@ nautilus_burn_drive_get_device (Nautilus
- }
- 
- /**
-+ * nautilus_burn_drive_get_cdrecord_device:
-+ * @drive: #NautilusBurnDrive
-+ *
-+ * Get the name of the device associated with the drive suitable for
-+ * user with cdrcord.
-+ *
-+ * Returns: device name.  Must be not be freed.
-+ *
-+ * Since: 2.16
-+ **/
-+const char *
-+nautilus_burn_drive_get_cdrecord_device (NautilusBurnDrive *drive)
-+{
-+        g_return_val_if_fail (drive != NULL, NULL);
-+
-+        return drive->priv->cdrecord_device;
-+}
-+
-+/**
-  * nautilus_burn_drive_get_drive_type:
-  * @drive: #NautilusBurnDrive
-  *
-@@ -1021,6 +1044,7 @@ nautilus_burn_drive_finalize (GObject *o
-         g_free (drive->priv->write_speeds);
-         g_free (drive->priv->display_name);
-         g_free (drive->priv->device);
-+        g_free (drive->priv->cdrecord_device);
- 
-         if (G_OBJECT_CLASS (nautilus_burn_drive_parent_class)->finalize != NULL) {
-                 (* G_OBJECT_CLASS (nautilus_burn_drive_parent_class)->finalize) (object);
-@@ -1038,6 +1062,7 @@ nautilus_burn_drive_init (NautilusBurnDr
-         drive->priv->max_speed_read  = 0;
-         drive->priv->write_speeds    = NULL;
-         drive->priv->device          = NULL;
-+        drive->priv->cdrecord_device = NULL;
- }
- 
- /**
diff --git a/sysutils/nautilus-cd-burner/files/patch-src_nautilus-burn-drive.h b/sysutils/nautilus-cd-burner/files/patch-src_nautilus-burn-drive.h
deleted file mode 100644
index f033fa3ba..000000000
--- a/sysutils/nautilus-cd-burner/files/patch-src_nautilus-burn-drive.h
+++ /dev/null
@@ -1,10 +0,0 @@
---- src/nautilus-burn-drive.h.orig        Sun Nov 19 13:37:32 2006
-+++ src/nautilus-burn-drive.h        Sun Nov 19 13:37:55 2006
-@@ -127,6 +127,7 @@ gboolean              nautilus_burn_driv
- int                   nautilus_burn_drive_get_drive_type           (NautilusBurnDrive       *drive);
- char *                nautilus_burn_drive_get_name_for_display     (NautilusBurnDrive       *drive);
- const char *          nautilus_burn_drive_get_device               (NautilusBurnDrive       *drive);
-+const char *          nautilus_burn_drive_get_cdrecord_device               (NautilusBurnDrive       *drive);
- 
- /* Capabilities */
- gboolean              nautilus_burn_drive_can_write                (NautilusBurnDrive       *drive);
diff --git a/sysutils/nautilus-cd-burner/files/patch-src_nautilus-burn-recorder.c b/sysutils/nautilus-cd-burner/files/patch-src_nautilus-burn-recorder.c
deleted file mode 100644
index 85f6416ab..000000000
--- a/sysutils/nautilus-cd-burner/files/patch-src_nautilus-burn-recorder.c
+++ /dev/null
@@ -1,29 +0,0 @@
---- src/nautilus-burn-recorder.c.orig        Fri Sep 29 14:18:37 2006
-+++ src/nautilus-burn-recorder.c        Mon Nov 20 18:13:24 2006
-@@ -1343,7 +1343,7 @@ nautilus_burn_recorder_write_cdrecord (N
-                 g_ptr_array_add (argv, "cdrdao");
-                 g_ptr_array_add (argv, "write");
-                 g_ptr_array_add (argv, "--device");
--                g_ptr_array_add (argv, (char *)nautilus_burn_drive_get_device (drive));
-+                g_ptr_array_add (argv, (char *)nautilus_burn_drive_get_cdrecord_device (drive));
-                 g_ptr_array_add (argv, "--speed");
-                 speed_str = g_strdup_printf ("%d", speed);
-                 g_ptr_array_add (argv, speed_str);
-@@ -1375,7 +1375,7 @@ nautilus_burn_recorder_write_cdrecord (N
-                 if (speed != 0) {
-                         g_ptr_array_add (argv, speed_str);
-                 }
--                dev_str = g_strdup_printf ("dev=%s", nautilus_burn_drive_get_device (drive));
-+                dev_str = g_strdup_printf ("dev=%s", nautilus_burn_drive_get_cdrecord_device (drive));
-                 g_ptr_array_add (argv, dev_str);
-                 if (flags & NAUTILUS_BURN_RECORDER_WRITE_DUMMY_WRITE) {
-                         g_ptr_array_add (argv, "-dummy");
-@@ -1486,7 +1486,7 @@ nautilus_burn_recorder_blank_disc_cdreco
-         argv = g_ptr_array_new ();
-         g_ptr_array_add (argv, "cdrecord");
- 
--        dev_str = g_strdup_printf ("dev=%s", nautilus_burn_drive_get_device (drive));
-+        dev_str = g_strdup_printf ("dev=%s", nautilus_burn_drive_get_cdrecord_device (drive));
-         g_ptr_array_add (argv, dev_str);
-         g_ptr_array_add (argv, "-v");
- 
diff --git a/sysutils/nautilus-cd-burner/files/patch-src_nautilus-cd-burner.c b/sysutils/nautilus-cd-burner/files/patch-src_nautilus-cd-burner.c
deleted file mode 100644
index 3ed061739..000000000
--- a/sysutils/nautilus-cd-burner/files/patch-src_nautilus-cd-burner.c
+++ /dev/null
@@ -1,20 +0,0 @@
---- src/nautilus-cd-burner.c.orig        Fri Jul 14 10:20:19 2006
-+++ src/nautilus-cd-burner.c        Sun Nov 19 13:41:34 2006
-@@ -27,6 +27,8 @@
- 
- #include "config.h"
- 
-+#include <sys/types.h>
-+#include <sys/stat.h>
- #include <time.h>
- #include <stdio.h>
- #include <stdlib.h>
-@@ -246,7 +248,7 @@ selection_dialog_response (GtkWidget *di
-                 /* save selections */
-                 gconf_client = gconf_client_get_default ();
-                 gconf_client_set_int (gconf_client, "/apps/nautilus-cd-burner/default_speed", speed, NULL);
--                gconf_save_device (gconf_client, nautilus_burn_drive_get_device (drive));
-+                gconf_save_device (gconf_client, nautilus_burn_drive_get_cdrecord_device (drive));
-                 g_object_unref (gconf_client);
- 
-                 operation = ncb_operation_new ();
diff --git a/sysutils/nautilus-cd-burner/pkg-descr b/sysutils/nautilus-cd-burner/pkg-descr
deleted file mode 100644
index 0bdde4f1a..000000000
--- a/sysutils/nautilus-cd-burner/pkg-descr
+++ /dev/null
@@ -1,2 +0,0 @@
-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-message b/sysutils/nautilus-cd-burner/pkg-message
deleted file mode 100644
index 3a47ff4fd..000000000
--- a/sysutils/nautilus-cd-burner/pkg-message
+++ /dev/null
@@ -1,21 +0,0 @@
-======================================================================
-In order to use nautilus-cd-burner, you must make sure your CD devices
-have the correct permissions.  You must also make sure you have:
-
-device		atapicam
-
-Configured in your kernel if you are using an ATAPI CD/DVD writer.
-To figure out which CD/DVD drive you will be using, run the following
-command as root:
-
-camcontrol devlist
-
-Your output will look similar to the following:
-
-<CREATIVE CD5233E-N 0.20>          at scbus1 target 0 lun 0 (cd0,pass0)
-
-The devices in parenthesis at the end are important.  You must make sure
-the /dev entries for those devices are writable by the users that will
-be using nautilus-cd-burner.  In addition to those devices, /dev/xpt*
-must also be writable to your nautilus-cd-burner users.
-======================================================================
diff --git a/sysutils/nautilus-cd-burner/pkg-plist b/sysutils/nautilus-cd-burner/pkg-plist
deleted file mode 100644
index 635ccb6e5..000000000
--- a/sysutils/nautilus-cd-burner/pkg-plist
+++ /dev/null
@@ -1,146 +0,0 @@
-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
-include/libnautilus-burn/nautilus-burn.h
-lib/libnautilus-burn.a
-lib/libnautilus-burn.la
-lib/libnautilus-burn.so
-lib/libnautilus-burn.so.4
-lib/nautilus/extensions-2.0/libnautilus-burn-extension.a
-lib/nautilus/extensions-2.0/libnautilus-burn-extension.la
-lib/nautilus/extensions-2.0/libnautilus-burn-extension.so
-libdata/pkgconfig/libnautilus-burn.pc
-share/applications/nautilus-cd-burner-open-iso.desktop
-share/applications/nautilus-cd-burner.desktop
-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/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
-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/gl/LC_MESSAGES/nautilus-cd-burner.mo
-share/locale/gu/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/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/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
-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/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/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
-share/locale/th/LC_MESSAGES/nautilus-cd-burner.mo
-share/locale/tr/LC_MESSAGES/nautilus-cd-burner.mo
-share/locale/ug/LC_MESSAGES/nautilus-cd-burner.mo
-share/locale/uk/LC_MESSAGES/nautilus-cd-burner.mo
-share/locale/vi/LC_MESSAGES/nautilus-cd-burner.mo
-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
-%%DATADIR%%/cdspin1.png
-%%DATADIR%%/cdspin2.png
-%%DATADIR%%/cdspin3.png
-%%DATADIR%%/cdspin4.png
-%%DATADIR%%/cdspin5.png
-%%DATADIR%%/cdspin6.png
-%%DATADIR%%/cdspin7.png
-%%DATADIR%%/cdspin8.png
-%%DATADIR%%/nautilus-cd-burner.glade
-@dirrm %%DATADIR%%
-@dirrmtry share/applications
-@dirrm include/libnautilus-burn
-@exec %%LOCALBASE%%/bin/update-desktop-database > /dev/null || /usr/bin/true
-@unexec %%LOCALBASE%%/bin/update-desktop-database > /dev/null || /usr/bin/true
-@dirrmtry share/locale/zh_HK/LC_MESSAGES
-@dirrmtry share/locale/zh_HK
-@dirrmtry share/locale/xh/LC_MESSAGES
-@dirrmtry share/locale/xh
-@dirrmtry share/locale/ug/LC_MESSAGES
-@dirrmtry share/locale/ug
-@dirrmtry share/locale/te/LC_MESSAGES
-@dirrmtry share/locale/te
-@dirrmtry share/locale/si/LC_MESSAGES
-@dirrmtry share/locale/si
-@dirrmtry share/locale/rw/LC_MESSAGES
-@dirrmtry share/locale/rw
-@dirrmtry share/locale/oc/LC_MESSAGES
-@dirrmtry share/locale/oc
-@dirrmtry share/locale/mr/LC_MESSAGES
-@dirrmtry share/locale/mr
-@dirrmtry share/locale/mg/LC_MESSAGES
-@dirrmtry share/locale/mg
-@dirrmtry share/locale/ku/LC_MESSAGES
-@dirrmtry share/locale/ku
-@dirrmtry share/locale/hy/LC_MESSAGES
-@dirrmtry share/locale/hy
-@dirrmtry share/locale/dz/LC_MESSAGES
-@dirrmtry share/locale/dz
-@dirrmtry share/locale/bn_IN/LC_MESSAGES
-@dirrmtry share/locale/bn_IN
-@dirrmtry share/locale/be@latin/LC_MESSAGES
-@dirrmtry share/locale/be@latin
-@dirrmtry share/locale/as/LC_MESSAGES
-@dirrmtry share/locale/as
diff --git a/sysutils/pessulus/Makefile b/sysutils/pessulus/Makefile
deleted file mode 100644
index d82c12aa6..000000000
--- a/sysutils/pessulus/Makefile
+++ /dev/null
@@ -1,40 +0,0 @@
-# New ports collection makefile for:	pessulus
-# Date created:				14 March 2006
-# Whom:					FreeBSD GNOME Team
-#
-# $FreeBSD$
-#   $MCom: ports/sysutils/pessulus/Makefile,v 1.14 2007/09/17 20:08:42 ahze Exp $
-#
-
-PORTNAME=	pessulus
-PORTVERSION=	2.16.4
-CATEGORIES=	sysutils gnome
-MASTER_SITES=	${MASTER_SITE_GNOME}
-MASTER_SITE_SUBDIR=	 sources/${PORTNAME}/${PORTVERSION:C/^([0-9]+\.[0-9]+).*/\1/}
-DIST_SUBDIR=	gnome2
-
-MAINTAINER=	gnome@FreeBSD.org
-COMMENT=	A lockdown editor for GNOME
-
-USE_GMAKE=	yes
-USE_GNOME=	gnomehack gnomeprefix intlhack pygnome2
-WANT_GNOME=	yes
-USE_PYTHON=	yes
-USE_GETTEXT=	yes
-USE_XLIB=	yes
-GNU_CONFIGURE=	yes
-CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" \
-		LDFLAGS="-L${LOCALBASE}/lib"
-
-DOCS=		AUTHORS COPYING ChangeLog HACKING \
-		MAINTAINERS NEWS README TODO
-
-.ifndef (NOPORTDOCS)
-post-install:
-	@${MKDIR} ${DOCSDIR}
-.for i in ${DOCS}
-	@${INSTALL_DATA} ${WRKSRC}/${i} ${DOCSDIR}
-.endfor
-.endif
-
-.include <bsd.port.mk>
diff --git a/sysutils/pessulus/distinfo b/sysutils/pessulus/distinfo
deleted file mode 100644
index f8179e2a9..000000000
--- a/sysutils/pessulus/distinfo
+++ /dev/null
@@ -1,3 +0,0 @@
-MD5 (gnome2/pessulus-2.16.4.tar.gz) = 8eabdafd9dda0ea69052234d238dac41
-SHA256 (gnome2/pessulus-2.16.4.tar.gz) = f2af702e2f0699b556206a5a2c9bdb8edbd0183279e618eeef132d1e0476bc9a
-SIZE (gnome2/pessulus-2.16.4.tar.gz) = 201497
diff --git a/sysutils/pessulus/pkg-descr b/sysutils/pessulus/pkg-descr
deleted file mode 100644
index f1105467e..000000000
--- a/sysutils/pessulus/pkg-descr
+++ /dev/null
@@ -1,6 +0,0 @@
-Pessulus is a lockdown editor for GNOME, written in python. It enables
-administrators to set mandatory settings in GConf. The users can not change
-these settings. Use of pessulus can be useful on computers that are open to
-use by everyone, e.g. in an internet cafe.
-
-WWW: http://www.gnome.org/~vuntz/pessulus/
diff --git a/sysutils/pessulus/pkg-plist b/sysutils/pessulus/pkg-plist
deleted file mode 100644
index 0d8d984c4..000000000
--- a/sysutils/pessulus/pkg-plist
+++ /dev/null
@@ -1,137 +0,0 @@
-bin/pessulus
-%%PYTHON_SITELIBDIR%%/Pessulus/__init__.py
-%%PYTHON_SITELIBDIR%%/Pessulus/__init__.pyc
-%%PYTHON_SITELIBDIR%%/Pessulus/__init__.pyo
-%%PYTHON_SITELIBDIR%%/Pessulus/config.py
-%%PYTHON_SITELIBDIR%%/Pessulus/config.pyc
-%%PYTHON_SITELIBDIR%%/Pessulus/config.pyo
-%%PYTHON_SITELIBDIR%%/Pessulus/disabledapplets.py
-%%PYTHON_SITELIBDIR%%/Pessulus/disabledapplets.pyc
-%%PYTHON_SITELIBDIR%%/Pessulus/disabledapplets.pyo
-%%PYTHON_SITELIBDIR%%/Pessulus/globalvar.py
-%%PYTHON_SITELIBDIR%%/Pessulus/globalvar.pyc
-%%PYTHON_SITELIBDIR%%/Pessulus/globalvar.pyo
-%%PYTHON_SITELIBDIR%%/Pessulus/icons.py
-%%PYTHON_SITELIBDIR%%/Pessulus/icons.pyc
-%%PYTHON_SITELIBDIR%%/Pessulus/icons.pyo
-%%PYTHON_SITELIBDIR%%/Pessulus/lockdownapplier.py
-%%PYTHON_SITELIBDIR%%/Pessulus/lockdownapplier.pyc
-%%PYTHON_SITELIBDIR%%/Pessulus/lockdownapplier.pyo
-%%PYTHON_SITELIBDIR%%/Pessulus/lockdownappliergconf.py
-%%PYTHON_SITELIBDIR%%/Pessulus/lockdownappliergconf.pyc
-%%PYTHON_SITELIBDIR%%/Pessulus/lockdownappliergconf.pyo
-%%PYTHON_SITELIBDIR%%/Pessulus/lockdownbutton.py
-%%PYTHON_SITELIBDIR%%/Pessulus/lockdownbutton.pyc
-%%PYTHON_SITELIBDIR%%/Pessulus/lockdownbutton.pyo
-%%PYTHON_SITELIBDIR%%/Pessulus/lockdowncheckbutton.py
-%%PYTHON_SITELIBDIR%%/Pessulus/lockdowncheckbutton.pyc
-%%PYTHON_SITELIBDIR%%/Pessulus/lockdowncheckbutton.pyo
-%%PYTHON_SITELIBDIR%%/Pessulus/main.py
-%%PYTHON_SITELIBDIR%%/Pessulus/main.pyc
-%%PYTHON_SITELIBDIR%%/Pessulus/main.pyo
-%%PYTHON_SITELIBDIR%%/Pessulus/maindialog.py
-%%PYTHON_SITELIBDIR%%/Pessulus/maindialog.pyc
-%%PYTHON_SITELIBDIR%%/Pessulus/maindialog.pyo
-%%PYTHON_SITELIBDIR%%/Pessulus/safeprotocols.py
-%%PYTHON_SITELIBDIR%%/Pessulus/safeprotocols.pyc
-%%PYTHON_SITELIBDIR%%/Pessulus/safeprotocols.pyo
-%%PYTHON_SITELIBDIR%%/Pessulus/simpleeditabletreeview.py
-%%PYTHON_SITELIBDIR%%/Pessulus/simpleeditabletreeview.pyc
-%%PYTHON_SITELIBDIR%%/Pessulus/simpleeditabletreeview.pyo
-share/applications/pessulus.desktop
-%%PORTDOCS%%%%DOCSDIR%%/AUTHORS
-%%PORTDOCS%%%%DOCSDIR%%/COPYING
-%%PORTDOCS%%%%DOCSDIR%%/ChangeLog
-%%PORTDOCS%%%%DOCSDIR%%/HACKING
-%%PORTDOCS%%%%DOCSDIR%%/MAINTAINERS
-%%PORTDOCS%%%%DOCSDIR%%/NEWS
-%%PORTDOCS%%%%DOCSDIR%%/README
-%%PORTDOCS%%%%DOCSDIR%%/TODO
-share/locale/ar/LC_MESSAGES/pessulus.mo
-share/locale/as/LC_MESSAGES/pessulus.mo
-share/locale/be/LC_MESSAGES/pessulus.mo
-share/locale/be@latin/LC_MESSAGES/pessulus.mo
-share/locale/bg/LC_MESSAGES/pessulus.mo
-share/locale/bn/LC_MESSAGES/pessulus.mo
-share/locale/bn_IN/LC_MESSAGES/pessulus.mo
-share/locale/ca/LC_MESSAGES/pessulus.mo
-share/locale/cs/LC_MESSAGES/pessulus.mo
-share/locale/cy/LC_MESSAGES/pessulus.mo
-share/locale/da/LC_MESSAGES/pessulus.mo
-share/locale/de/LC_MESSAGES/pessulus.mo
-share/locale/dz/LC_MESSAGES/pessulus.mo
-share/locale/el/LC_MESSAGES/pessulus.mo
-share/locale/en_CA/LC_MESSAGES/pessulus.mo
-share/locale/en_GB/LC_MESSAGES/pessulus.mo
-share/locale/es/LC_MESSAGES/pessulus.mo
-share/locale/et/LC_MESSAGES/pessulus.mo
-share/locale/eu/LC_MESSAGES/pessulus.mo
-share/locale/fi/LC_MESSAGES/pessulus.mo
-share/locale/fr/LC_MESSAGES/pessulus.mo
-share/locale/gl/LC_MESSAGES/pessulus.mo
-share/locale/gu/LC_MESSAGES/pessulus.mo
-share/locale/he/LC_MESSAGES/pessulus.mo
-share/locale/hi/LC_MESSAGES/pessulus.mo
-share/locale/hu/LC_MESSAGES/pessulus.mo
-share/locale/id/LC_MESSAGES/pessulus.mo
-share/locale/it/LC_MESSAGES/pessulus.mo
-share/locale/ja/LC_MESSAGES/pessulus.mo
-share/locale/ka/LC_MESSAGES/pessulus.mo
-share/locale/ko/LC_MESSAGES/pessulus.mo
-share/locale/ku/LC_MESSAGES/pessulus.mo
-share/locale/lt/LC_MESSAGES/pessulus.mo
-share/locale/lv/LC_MESSAGES/pessulus.mo
-share/locale/mk/LC_MESSAGES/pessulus.mo
-share/locale/ml/LC_MESSAGES/pessulus.mo
-share/locale/mn/LC_MESSAGES/pessulus.mo
-share/locale/mr/LC_MESSAGES/pessulus.mo
-share/locale/nb/LC_MESSAGES/pessulus.mo
-share/locale/ne/LC_MESSAGES/pessulus.mo
-share/locale/nl/LC_MESSAGES/pessulus.mo
-share/locale/nn/LC_MESSAGES/pessulus.mo
-share/locale/oc/LC_MESSAGES/pessulus.mo
-share/locale/or/LC_MESSAGES/pessulus.mo
-share/locale/pa/LC_MESSAGES/pessulus.mo
-share/locale/pl/LC_MESSAGES/pessulus.mo
-share/locale/pt/LC_MESSAGES/pessulus.mo
-share/locale/pt_BR/LC_MESSAGES/pessulus.mo
-share/locale/ru/LC_MESSAGES/pessulus.mo
-share/locale/sk/LC_MESSAGES/pessulus.mo
-share/locale/sl/LC_MESSAGES/pessulus.mo
-share/locale/sq/LC_MESSAGES/pessulus.mo
-share/locale/sr/LC_MESSAGES/pessulus.mo
-share/locale/sr@Latn/LC_MESSAGES/pessulus.mo
-share/locale/sv/LC_MESSAGES/pessulus.mo
-share/locale/ta/LC_MESSAGES/pessulus.mo
-share/locale/te/LC_MESSAGES/pessulus.mo
-share/locale/th/LC_MESSAGES/pessulus.mo
-share/locale/tr/LC_MESSAGES/pessulus.mo
-share/locale/uk/LC_MESSAGES/pessulus.mo
-share/locale/vi/LC_MESSAGES/pessulus.mo
-share/locale/zh_CN/LC_MESSAGES/pessulus.mo
-share/locale/zh_HK/LC_MESSAGES/pessulus.mo
-share/locale/zh_TW/LC_MESSAGES/pessulus.mo
-%%DATADIR%%/glade/pessulus.glade
-@dirrm %%DATADIR%%/glade
-@dirrm %%DATADIR%%
-%%PORTDOCS%%@dirrm %%DOCSDIR%%
-@dirrm %%PYTHON_SITELIBDIR%%/Pessulus
-@dirrmtry share/applications
-@dirrmtry share/locale/zh_HK/LC_MESSAGES
-@dirrmtry share/locale/zh_HK
-@dirrmtry share/locale/te/LC_MESSAGES
-@dirrmtry share/locale/te
-@dirrmtry share/locale/oc/LC_MESSAGES
-@dirrmtry share/locale/oc
-@dirrmtry share/locale/mr/LC_MESSAGES
-@dirrmtry share/locale/mr
-@dirrmtry share/locale/ku/LC_MESSAGES
-@dirrmtry share/locale/ku
-@dirrmtry share/locale/dz/LC_MESSAGES
-@dirrmtry share/locale/dz
-@dirrmtry share/locale/bn_IN/LC_MESSAGES
-@dirrmtry share/locale/bn_IN
-@dirrmtry share/locale/be@latin/LC_MESSAGES
-@dirrmtry share/locale/be@latin
-@dirrmtry share/locale/as/LC_MESSAGES
-@dirrmtry share/locale/as
diff --git a/sysutils/policykit-gnome/Makefile b/sysutils/policykit-gnome/Makefile
deleted file mode 100644
index d6b94f714..000000000
--- a/sysutils/policykit-gnome/Makefile
+++ /dev/null
@@ -1,33 +0,0 @@
-# New ports collection makefile for:   PolicyKit-gnome
-# Date Created:			20 January 2008
-# Whom:				Joe Marcus Clarke <marcus@FreeBSD.org>
-#
-# $FreeBSD$
-#   $MCom: ports/sysutils/policykit-gnome/Makefile,v 1.3 2008/01/24 02:56:07 mezz Exp $
-#
-
-PORTNAME=	policykit-gnome
-PORTVERSION=	0.7
-PORTREVISION=	2
-CATEGORIES=	sysutils gnome
-MASTER_SITES=	http://hal.freedesktop.org/releases/
-DISTNAME=	PolicyKit-gnome-${PORTVERSION}
-
-MAINTAINER=	gnome@FreeBSD.org
-COMMENT=	GNOME frontend to the PolicKit framework
-
-LIB_DEPENDS=	polkit.2:${PORTSDIR}/sysutils/policykit \
-    		sexy.2:${PORTSDIR}/x11-toolkits/libsexy
-
-USE_BZIP2=	yes
-USE_GMAKE=	yes
-USE_GETTEXT=	yes
-USE_GNOME=	gnomehack gnometarget gnomevfs2 intlhack gnomedocutils
-GNU_CONFIGURE=	yes
-USE_LDCONFIG=	yes
-CONFIGURE_ARGS=	--disable-gtk-doc \
-		--localstatedir=/var
-CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" \
-		LDFLAGS="-L${LOCALBASE}/lib"
-
-.include <bsd.port.mk>
diff --git a/sysutils/policykit-gnome/distinfo b/sysutils/policykit-gnome/distinfo
deleted file mode 100644
index c6fa5c414..000000000
--- a/sysutils/policykit-gnome/distinfo
+++ /dev/null
@@ -1,3 +0,0 @@
-MD5 (PolicyKit-gnome-0.7.tar.bz2) = 978ccbe3c9426f4d59c7903f566f954b
-SHA256 (PolicyKit-gnome-0.7.tar.bz2) = bff0612c12cc8380774674293fc89cb486d8e79bdb5c5b31b25aabc38d2251e4
-SIZE (PolicyKit-gnome-0.7.tar.bz2) = 990594
diff --git a/sysutils/policykit-gnome/files/patch-Makefile.in b/sysutils/policykit-gnome/files/patch-Makefile.in
deleted file mode 100644
index da7d36ad0..000000000
--- a/sysutils/policykit-gnome/files/patch-Makefile.in
+++ /dev/null
@@ -1,11 +0,0 @@
---- Makefile.in.orig	2008-01-20 20:11:12.000000000 -0500
-+++ Makefile.in	2008-01-20 20:11:21.000000000 -0500
-@@ -251,7 +251,7 @@ top_builddir = @top_builddir@
- top_srcdir = @top_srcdir@
- 
- # Need to build docs after examples because the docs include generated files 
--SUBDIRS = data src polkit-gnome tools $(am__append_1) doc po
-+SUBDIRS = data src polkit-gnome tools $(am__append_1) po
- EXTRA_DIST = \
- 	autogen.sh		\
- 	intltool-extract.in	\
diff --git a/sysutils/policykit-gnome/pkg-descr b/sysutils/policykit-gnome/pkg-descr
deleted file mode 100644
index 37eebb83c..000000000
--- a/sysutils/policykit-gnome/pkg-descr
+++ /dev/null
@@ -1,5 +0,0 @@
-PolicyKit is a framework for defining policy for system-wide components and
-for desktop pieces to configure it.  PolicyKit-gnome is a GTK+/GNOME frontend
-for that framework.
-
-WWW: http://www.freedesktop.org/Software/hal
diff --git a/sysutils/policykit-gnome/pkg-plist b/sysutils/policykit-gnome/pkg-plist
deleted file mode 100644
index d4e3266de..000000000
--- a/sysutils/policykit-gnome/pkg-plist
+++ /dev/null
@@ -1,21 +0,0 @@
-bin/polkit-gnome-authorization
-bin/polkit-gnome-example
-include/PolicyKit/polkit-gnome/polkit-gnome-action.h
-include/PolicyKit/polkit-gnome/polkit-gnome-auth.h
-include/PolicyKit/polkit-gnome/polkit-gnome-context.h
-include/PolicyKit/polkit-gnome/polkit-gnome-toggle-action.h
-include/PolicyKit/polkit-gnome/polkit-gnome.h
-lib/libpolkit-gnome.a
-lib/libpolkit-gnome.la
-lib/libpolkit-gnome.so
-lib/libpolkit-gnome.so.0
-libdata/pkgconfig/polkit-gnome.pc
-libexec/polkit-gnome-manager
-share/PolicyKit/policy/polkit-gnome-example.policy
-share/applications/polkit-gnome-authorization.desktop
-share/dbus-1/services/gnome-org.freedesktop.PolicyKit.AuthenticationAgent.service
-share/dbus-1/services/org.gnome.PolicyKit.AuthorizationManager.service
-share/dbus-1/services/org.gnome.PolicyKit.service
-share/locale/da/LC_MESSAGES/PolicyKit-gnome.mo
-@dirrmtry share/applications
-@dirrm include/PolicyKit/polkit-gnome
diff --git a/sysutils/policykit/Makefile b/sysutils/policykit/Makefile
deleted file mode 100644
index bd70a308e..000000000
--- a/sysutils/policykit/Makefile
+++ /dev/null
@@ -1,58 +0,0 @@
-# New ports collection makefile for:   PolicyKit
-# Date Created:			01 May 2006
-# Whom:				Joe Marcus Clarke <marcus@FreeBSD.org>
-#
-# $FreeBSD$
-#   $MCom: ports/sysutils/policykit/Makefile,v 1.18 2008/01/19 21:30:05 marcus Exp $
-#
-
-PORTNAME=	policykit
-PORTVERSION=	0.7
-PORTREVISION=	2
-CATEGORIES=	sysutils gnome
-MASTER_SITES=	http://hal.freedesktop.org/releases/
-DISTNAME=	PolicyKit-${PORTVERSION}
-
-MAINTAINER=	gnome@FreeBSD.org
-COMMENT=	Framework for controlling access to system-wide components
-
-BUILD_DEPENDS=	docbook2html:${PORTSDIR}/textproc/docbook-utils \
-    		${LOCALBASE}/share/sgml/docbook/4.1/catalog:${PORTSDIR}/textproc/docbook-410 \
-		xsltproc:${PORTSDIR}/textproc/libxslt \
-		${LOCALBASE}/share/xsl/docbook/manpages/docbook.xsl:${PORTSDIR}/textproc/docbook-xsl
-LIB_DEPENDS=	dbus-glib-1.2:${PORTSDIR}/devel/dbus-glib \
-    		expat.6:${PORTSDIR}/textproc/expat2
-RUN_DEPENDS=	bash:${PORTSDIR}/shells/bash
-
-USE_GNOME=	gnomehack gnometarget glib20 intlhack
-USE_GMAKE=	yes
-GNU_CONFIGURE=	yes
-USE_LDCONFIG=	yes
-CONFIGURE_ARGS=	--disable-gtk-doc \
-		--with-pam-include=system \
-		--with-os-type=freebsd \
-		--localstatedir=/var \
-		--with-polkit-user=polkit \
-		--with-polkit-group=polkit
-CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" \
-		LDFLAGS="-L${LOCALBASE}/lib" \
-		GTKDOC="false"
-
-MAN1=		polkit-action.1 polkit-auth.1 polkit-config-file-validate.1 \
-		polkit-policy-file-validate.1
-MAN5=		PolicyKit.conf.5
-MAN8=		PolicyKit.8
-
-post-install:
-	${MKDIR} ${PREFIX}/etc/PolicyKit
-	if [ ! -f ${PREFIX}/etc/PolicyKit/PolicyKit.conf ]; then \
-	    	${INSTALL_DATA} ${WRKSRC}/data/PolicyKit.conf \
-			${PREFIX}/etc/PolicyKit/PolicyKit.conf ; \
-	fi
-	${INSTALL_DATA} ${WRKSRC}/data/PolicyKit.conf \
-	    	${PREFIX}/etc/PolicyKit/PolicyKit.conf.dist
-.if !defined(PACKAGE_BUILDING)
-	@${SETENV} PKG_PREFIX=${PREFIX} ${SH} ${PKGINSTALL} ${PKGNAME} POST-INSTALL
-.endif
-
-.include <bsd.port.mk>
diff --git a/sysutils/policykit/distinfo b/sysutils/policykit/distinfo
deleted file mode 100644
index 875461516..000000000
--- a/sysutils/policykit/distinfo
+++ /dev/null
@@ -1,3 +0,0 @@
-MD5 (PolicyKit-0.7.tar.gz) = 99e0cc588310656fa25f8f66a411c71f
-SHA256 (PolicyKit-0.7.tar.gz) = 87245f790142a245a5f5ba75d4a4e95612b391e82cf4d61659b3e50c4f6b9eeb
-SIZE (PolicyKit-0.7.tar.gz) = 1214032
diff --git a/sysutils/policykit/files/patch-Makefile.in b/sysutils/policykit/files/patch-Makefile.in
deleted file mode 100644
index 29a907e44..000000000
--- a/sysutils/policykit/files/patch-Makefile.in
+++ /dev/null
@@ -1,11 +0,0 @@
---- Makefile.in.orig	2007-12-22 19:11:03.000000000 -0500
-+++ Makefile.in	2007-12-22 19:11:13.000000000 -0500
-@@ -246,7 +246,7 @@ sysconfdir = @sysconfdir@
- target_alias = @target_alias@
- top_builddir = @top_builddir@
- top_srcdir = @top_srcdir@
--SUBDIRS = data src polkitd doc tools policy po test
-+SUBDIRS = data src polkitd doc tools policy po
- EXTRA_DIST = \
- 	HACKING 		\
- 	mkinstalldirs 		\
diff --git a/sysutils/policykit/files/patch-config.h.in b/sysutils/policykit/files/patch-config.h.in
deleted file mode 100644
index b8cb8f384..000000000
--- a/sysutils/policykit/files/patch-config.h.in
+++ /dev/null
@@ -1,34 +0,0 @@
---- config.h.in.orig	2007-11-30 20:43:35.000000000 -0500
-+++ config.h.in	2007-12-24 14:47:06.000000000 -0500
-@@ -24,6 +24,18 @@
- /* Define to 1 if you have the `getgrouplist' function. */
- #undef HAVE_GETGROUPLIST
- 
-+/* Define to 1 if you have the `clearenv' function. */
-+#undef HAVE_CLEARENV
-+
-+/* Define to 1 if you have the `strndup' function. */
-+#undef HAVE_STRNDUP
-+
-+/* Define to 1 if you have the `readdir64' function. */
-+#undef HAVE_READDIR64
-+
-+/* Define to 1 if you have the `getline' function. */
-+#undef HAVE_GETLINE
-+
- /* Define if the GNU gettext() function is already present or preinstalled. */
- #undef HAVE_GETTEXT
- 
-@@ -117,6 +129,12 @@
- /* Define if pam_strerror takes two arguments */
- #undef PAM_STRERROR_TWO_ARGS
- 
-+/* Enable Linux inotify() usage */
-+#undef HAVE_INOTIFY
-+
-+/* Enable BSD kqueue() usage */
-+#undef HAVE_KQUEUE
-+
- /* Authorization Database to use */
- #undef POLKIT_AUTHDB
- 
diff --git a/sysutils/policykit/files/patch-configure b/sysutils/policykit/files/patch-configure
deleted file mode 100644
index 2e99765e7..000000000
--- a/sysutils/policykit/files/patch-configure
+++ /dev/null
@@ -1,735 +0,0 @@
---- configure.bak	2007-11-30 20:42:54.000000000 -0500
-+++ configure	2007-12-23 00:35:53.000000000 -0500
-@@ -929,10 +929,16 @@ OS_TYPE_GENTOO_TRUE
- OS_TYPE_GENTOO_FALSE
- OS_TYPE_PARDUS_TRUE
- OS_TYPE_PARDUS_FALSE
-+OS_TYPE_FREEBSD_TRUE
-+OS_TYPE_FREEBSD_FALSE
- PAM_FILE_INCLUDE_AUTH
- PAM_FILE_INCLUDE_ACCOUNT
- PAM_FILE_INCLUDE_PASSWORD
- PAM_FILE_INCLUDE_SESSION
-+HAVE_INOTIFY_TRUE
-+HAVE_INOTIFY_FALSE
-+HAVE_KQUEUE_TRUE
-+HAVE_KQUEUE_FALSE
- INTLTOOL_DESKTOP_RULE
- INTLTOOL_DIRECTORY_RULE
- INTLTOOL_KEYS_RULE
-@@ -6544,7 +6550,7 @@ ia64-*-hpux*)
-   ;;
- *-*-irix6*)
-   # Find out which ABI we are using.
--  echo '#line 6547 "configure"' > conftest.$ac_ext
-+  echo '#line 6553 "configure"' > conftest.$ac_ext
-   if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
-   (eval $ac_compile) 2>&5
-   ac_status=$?
-@@ -8882,11 +8888,11 @@ else
-    -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
-    -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
-    -e 's:$: $lt_compiler_flag:'`
--   (eval echo "\"\$as_me:8885: $lt_compile\"" >&5)
-+   (eval echo "\"\$as_me:8891: $lt_compile\"" >&5)
-    (eval "$lt_compile" 2>conftest.err)
-    ac_status=$?
-    cat conftest.err >&5
--   echo "$as_me:8889: \$? = $ac_status" >&5
-+   echo "$as_me:8895: \$? = $ac_status" >&5
-    if (exit $ac_status) && test -s "$ac_outfile"; then
-      # The compiler can only warn and ignore the option if not recognized
-      # So say no if there are warnings other than the usual output.
-@@ -9172,11 +9178,11 @@ else
-    -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
-    -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
-    -e 's:$: $lt_compiler_flag:'`
--   (eval echo "\"\$as_me:9175: $lt_compile\"" >&5)
-+   (eval echo "\"\$as_me:9181: $lt_compile\"" >&5)
-    (eval "$lt_compile" 2>conftest.err)
-    ac_status=$?
-    cat conftest.err >&5
--   echo "$as_me:9179: \$? = $ac_status" >&5
-+   echo "$as_me:9185: \$? = $ac_status" >&5
-    if (exit $ac_status) && test -s "$ac_outfile"; then
-      # The compiler can only warn and ignore the option if not recognized
-      # So say no if there are warnings other than the usual output.
-@@ -9276,11 +9282,11 @@ else
-    -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
-    -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
-    -e 's:$: $lt_compiler_flag:'`
--   (eval echo "\"\$as_me:9279: $lt_compile\"" >&5)
-+   (eval echo "\"\$as_me:9285: $lt_compile\"" >&5)
-    (eval "$lt_compile" 2>out/conftest.err)
-    ac_status=$?
-    cat out/conftest.err >&5
--   echo "$as_me:9283: \$? = $ac_status" >&5
-+   echo "$as_me:9289: \$? = $ac_status" >&5
-    if (exit $ac_status) && test -s out/conftest2.$ac_objext
-    then
-      # The compiler can only warn and ignore the option if not recognized
-@@ -11627,7 +11633,7 @@ else
-   lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
-   lt_status=$lt_dlunknown
-   cat > conftest.$ac_ext <<EOF
--#line 11630 "configure"
-+#line 11636 "configure"
- #include "confdefs.h"
- 
- #if HAVE_DLFCN_H
-@@ -11727,7 +11733,7 @@ else
-   lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
-   lt_status=$lt_dlunknown
-   cat > conftest.$ac_ext <<EOF
--#line 11730 "configure"
-+#line 11736 "configure"
- #include "confdefs.h"
- 
- #if HAVE_DLFCN_H
-@@ -14147,11 +14153,11 @@ else
-    -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
-    -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
-    -e 's:$: $lt_compiler_flag:'`
--   (eval echo "\"\$as_me:14150: $lt_compile\"" >&5)
-+   (eval echo "\"\$as_me:14156: $lt_compile\"" >&5)
-    (eval "$lt_compile" 2>conftest.err)
-    ac_status=$?
-    cat conftest.err >&5
--   echo "$as_me:14154: \$? = $ac_status" >&5
-+   echo "$as_me:14160: \$? = $ac_status" >&5
-    if (exit $ac_status) && test -s "$ac_outfile"; then
-      # The compiler can only warn and ignore the option if not recognized
-      # So say no if there are warnings other than the usual output.
-@@ -14251,11 +14257,11 @@ else
-    -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
-    -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
-    -e 's:$: $lt_compiler_flag:'`
--   (eval echo "\"\$as_me:14254: $lt_compile\"" >&5)
-+   (eval echo "\"\$as_me:14260: $lt_compile\"" >&5)
-    (eval "$lt_compile" 2>out/conftest.err)
-    ac_status=$?
-    cat out/conftest.err >&5
--   echo "$as_me:14258: \$? = $ac_status" >&5
-+   echo "$as_me:14264: \$? = $ac_status" >&5
-    if (exit $ac_status) && test -s out/conftest2.$ac_objext
-    then
-      # The compiler can only warn and ignore the option if not recognized
-@@ -15815,11 +15821,11 @@ else
-    -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
-    -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
-    -e 's:$: $lt_compiler_flag:'`
--   (eval echo "\"\$as_me:15818: $lt_compile\"" >&5)
-+   (eval echo "\"\$as_me:15824: $lt_compile\"" >&5)
-    (eval "$lt_compile" 2>conftest.err)
-    ac_status=$?
-    cat conftest.err >&5
--   echo "$as_me:15822: \$? = $ac_status" >&5
-+   echo "$as_me:15828: \$? = $ac_status" >&5
-    if (exit $ac_status) && test -s "$ac_outfile"; then
-      # The compiler can only warn and ignore the option if not recognized
-      # So say no if there are warnings other than the usual output.
-@@ -15919,11 +15925,11 @@ else
-    -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
-    -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
-    -e 's:$: $lt_compiler_flag:'`
--   (eval echo "\"\$as_me:15922: $lt_compile\"" >&5)
-+   (eval echo "\"\$as_me:15928: $lt_compile\"" >&5)
-    (eval "$lt_compile" 2>out/conftest.err)
-    ac_status=$?
-    cat out/conftest.err >&5
--   echo "$as_me:15926: \$? = $ac_status" >&5
-+   echo "$as_me:15932: \$? = $ac_status" >&5
-    if (exit $ac_status) && test -s out/conftest2.$ac_objext
-    then
-      # The compiler can only warn and ignore the option if not recognized
-@@ -18108,11 +18114,11 @@ else
-    -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
-    -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
-    -e 's:$: $lt_compiler_flag:'`
--   (eval echo "\"\$as_me:18111: $lt_compile\"" >&5)
-+   (eval echo "\"\$as_me:18117: $lt_compile\"" >&5)
-    (eval "$lt_compile" 2>conftest.err)
-    ac_status=$?
-    cat conftest.err >&5
--   echo "$as_me:18115: \$? = $ac_status" >&5
-+   echo "$as_me:18121: \$? = $ac_status" >&5
-    if (exit $ac_status) && test -s "$ac_outfile"; then
-      # The compiler can only warn and ignore the option if not recognized
-      # So say no if there are warnings other than the usual output.
-@@ -18398,11 +18404,11 @@ else
-    -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
-    -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
-    -e 's:$: $lt_compiler_flag:'`
--   (eval echo "\"\$as_me:18401: $lt_compile\"" >&5)
-+   (eval echo "\"\$as_me:18407: $lt_compile\"" >&5)
-    (eval "$lt_compile" 2>conftest.err)
-    ac_status=$?
-    cat conftest.err >&5
--   echo "$as_me:18405: \$? = $ac_status" >&5
-+   echo "$as_me:18411: \$? = $ac_status" >&5
-    if (exit $ac_status) && test -s "$ac_outfile"; then
-      # The compiler can only warn and ignore the option if not recognized
-      # So say no if there are warnings other than the usual output.
-@@ -18502,11 +18508,11 @@ else
-    -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
-    -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
-    -e 's:$: $lt_compiler_flag:'`
--   (eval echo "\"\$as_me:18505: $lt_compile\"" >&5)
-+   (eval echo "\"\$as_me:18511: $lt_compile\"" >&5)
-    (eval "$lt_compile" 2>out/conftest.err)
-    ac_status=$?
-    cat out/conftest.err >&5
--   echo "$as_me:18509: \$? = $ac_status" >&5
-+   echo "$as_me:18515: \$? = $ac_status" >&5
-    if (exit $ac_status) && test -s out/conftest2.$ac_objext
-    then
-      # The compiler can only warn and ignore the option if not recognized
-@@ -22501,7 +22507,9 @@ fi
- 
- 
- 
--for ac_func in getgrouplist
-+
-+
-+for ac_func in getgrouplist clearenv strndup getline readdir64
- do
- as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh`
- { echo "$as_me:$LINENO: checking for $ac_func" >&5
-@@ -24087,6 +24095,14 @@ else
-   OS_TYPE_PARDUS_FALSE=
- fi
- 
-+ if test x$with_os_type = xfreebsd; then
-+  OS_TYPE_FREEBSD_TRUE=
-+  OS_TYPE_FREEBSD_FALSE='#'
-+else
-+  OS_TYPE_FREEBSD_TRUE='#'
-+  OS_TYPE_FREEBSD_FALSE=
-+fi
-+
- 
- 
- # Check whether --with-pam-include was given.
-@@ -24111,6 +24127,11 @@ elif test x$with_os_type = xsuse ; then
-    PAM_FILE_INCLUDE_ACCOUNT=common-account
-    PAM_FILE_INCLUDE_PASSWORD=common-password
-    PAM_FILE_INCLUDE_SESSION=common-session
-+elif test x$with_os_type = xfreebsd ; then
-+    PAM_FILE_INCLUDE_AUTH=system
-+    PAM_FILE_INCLUDE_ACCOUNT=system
-+    PAM_FILE_INCLUDE_PASSWORD=system
-+    PAM_FILE_INCLUDE_SESSION=system
- else
-    PAM_FILE_INCLUDE_AUTH=system-auth
-    PAM_FILE_INCLUDE_ACCOUNT=system-auth
-@@ -24143,6 +24164,430 @@ cat >>confdefs.h <<_ACEOF
- _ACEOF
- 
- 
-+have_inotify=no
-+
-+for ac_header in linux/inotify.h
-+do
-+as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
-+if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
-+  { echo "$as_me:$LINENO: checking for $ac_header" >&5
-+echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6; }
-+if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
-+  echo $ECHO_N "(cached) $ECHO_C" >&6
-+fi
-+ac_res=`eval echo '${'$as_ac_Header'}'`
-+	       { echo "$as_me:$LINENO: result: $ac_res" >&5
-+echo "${ECHO_T}$ac_res" >&6; }
-+else
-+  # Is the header compilable?
-+{ echo "$as_me:$LINENO: checking $ac_header usability" >&5
-+echo $ECHO_N "checking $ac_header usability... $ECHO_C" >&6; }
-+cat >conftest.$ac_ext <<_ACEOF
-+/* confdefs.h.  */
-+_ACEOF
-+cat confdefs.h >>conftest.$ac_ext
-+cat >>conftest.$ac_ext <<_ACEOF
-+/* end confdefs.h.  */
-+$ac_includes_default
-+#include <$ac_header>
-+_ACEOF
-+rm -f conftest.$ac_objext
-+if { (ac_try="$ac_compile"
-+case "(($ac_try" in
-+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+  *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+  (eval "$ac_compile") 2>conftest.er1
-+  ac_status=$?
-+  grep -v '^ *+' conftest.er1 >conftest.err
-+  rm -f conftest.er1
-+  cat conftest.err >&5
-+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+  (exit $ac_status); } && {
-+	 test -z "$ac_c_werror_flag" ||
-+	 test ! -s conftest.err
-+       } && test -s conftest.$ac_objext; then
-+  ac_header_compiler=yes
-+else
-+  echo "$as_me: failed program was:" >&5
-+sed 's/^/| /' conftest.$ac_ext >&5
-+
-+	ac_header_compiler=no
-+fi
-+
-+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-+{ echo "$as_me:$LINENO: result: $ac_header_compiler" >&5
-+echo "${ECHO_T}$ac_header_compiler" >&6; }
-+
-+# Is the header present?
-+{ echo "$as_me:$LINENO: checking $ac_header presence" >&5
-+echo $ECHO_N "checking $ac_header presence... $ECHO_C" >&6; }
-+cat >conftest.$ac_ext <<_ACEOF
-+/* confdefs.h.  */
-+_ACEOF
-+cat confdefs.h >>conftest.$ac_ext
-+cat >>conftest.$ac_ext <<_ACEOF
-+/* end confdefs.h.  */
-+#include <$ac_header>
-+_ACEOF
-+if { (ac_try="$ac_cpp conftest.$ac_ext"
-+case "(($ac_try" in
-+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+  *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+  (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1
-+  ac_status=$?
-+  grep -v '^ *+' conftest.er1 >conftest.err
-+  rm -f conftest.er1
-+  cat conftest.err >&5
-+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+  (exit $ac_status); } >/dev/null && {
-+	 test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" ||
-+	 test ! -s conftest.err
-+       }; then
-+  ac_header_preproc=yes
-+else
-+  echo "$as_me: failed program was:" >&5
-+sed 's/^/| /' conftest.$ac_ext >&5
-+
-+  ac_header_preproc=no
-+fi
-+
-+rm -f conftest.err conftest.$ac_ext
-+{ echo "$as_me:$LINENO: result: $ac_header_preproc" >&5
-+echo "${ECHO_T}$ac_header_preproc" >&6; }
-+
-+# So?  What about this header?
-+case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in
-+  yes:no: )
-+    { echo "$as_me:$LINENO: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&5
-+echo "$as_me: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&2;}
-+    { echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the compiler's result" >&5
-+echo "$as_me: WARNING: $ac_header: proceeding with the compiler's result" >&2;}
-+    ac_header_preproc=yes
-+    ;;
-+  no:yes:* )
-+    { echo "$as_me:$LINENO: WARNING: $ac_header: present but cannot be compiled" >&5
-+echo "$as_me: WARNING: $ac_header: present but cannot be compiled" >&2;}
-+    { echo "$as_me:$LINENO: WARNING: $ac_header:     check for missing prerequisite headers?" >&5
-+echo "$as_me: WARNING: $ac_header:     check for missing prerequisite headers?" >&2;}
-+    { echo "$as_me:$LINENO: WARNING: $ac_header: see the Autoconf documentation" >&5
-+echo "$as_me: WARNING: $ac_header: see the Autoconf documentation" >&2;}
-+    { echo "$as_me:$LINENO: WARNING: $ac_header:     section \"Present But Cannot Be Compiled\"" >&5
-+echo "$as_me: WARNING: $ac_header:     section \"Present But Cannot Be Compiled\"" >&2;}
-+    { echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the preprocessor's result" >&5
-+echo "$as_me: WARNING: $ac_header: proceeding with the preprocessor's result" >&2;}
-+    { echo "$as_me:$LINENO: WARNING: $ac_header: in the future, the compiler will take precedence" >&5
-+echo "$as_me: WARNING: $ac_header: in the future, the compiler will take precedence" >&2;}
-+    ( cat <<\_ASBOX
-+## ----------------------------- ##
-+## Report this to david@fubar.dk ##
-+## ----------------------------- ##
-+_ASBOX
-+     ) | sed "s/^/$as_me: WARNING:     /" >&2
-+    ;;
-+esac
-+{ echo "$as_me:$LINENO: checking for $ac_header" >&5
-+echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6; }
-+if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
-+  echo $ECHO_N "(cached) $ECHO_C" >&6
-+else
-+  eval "$as_ac_Header=\$ac_header_preproc"
-+fi
-+ac_res=`eval echo '${'$as_ac_Header'}'`
-+	       { echo "$as_me:$LINENO: result: $ac_res" >&5
-+echo "${ECHO_T}$ac_res" >&6; }
-+
-+fi
-+if test `eval echo '${'$as_ac_Header'}'` = yes; then
-+  cat >>confdefs.h <<_ACEOF
-+#define `echo "HAVE_$ac_header" | $as_tr_cpp` 1
-+_ACEOF
-+ have_inotify=yes
-+fi
-+
-+done
-+
-+
-+for ac_header in sys/inotify.h
-+do
-+as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
-+if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
-+  { echo "$as_me:$LINENO: checking for $ac_header" >&5
-+echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6; }
-+if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
-+  echo $ECHO_N "(cached) $ECHO_C" >&6
-+fi
-+ac_res=`eval echo '${'$as_ac_Header'}'`
-+	       { echo "$as_me:$LINENO: result: $ac_res" >&5
-+echo "${ECHO_T}$ac_res" >&6; }
-+else
-+  # Is the header compilable?
-+{ echo "$as_me:$LINENO: checking $ac_header usability" >&5
-+echo $ECHO_N "checking $ac_header usability... $ECHO_C" >&6; }
-+cat >conftest.$ac_ext <<_ACEOF
-+/* confdefs.h.  */
-+_ACEOF
-+cat confdefs.h >>conftest.$ac_ext
-+cat >>conftest.$ac_ext <<_ACEOF
-+/* end confdefs.h.  */
-+$ac_includes_default
-+#include <$ac_header>
-+_ACEOF
-+rm -f conftest.$ac_objext
-+if { (ac_try="$ac_compile"
-+case "(($ac_try" in
-+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+  *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+  (eval "$ac_compile") 2>conftest.er1
-+  ac_status=$?
-+  grep -v '^ *+' conftest.er1 >conftest.err
-+  rm -f conftest.er1
-+  cat conftest.err >&5
-+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+  (exit $ac_status); } && {
-+	 test -z "$ac_c_werror_flag" ||
-+	 test ! -s conftest.err
-+       } && test -s conftest.$ac_objext; then
-+  ac_header_compiler=yes
-+else
-+  echo "$as_me: failed program was:" >&5
-+sed 's/^/| /' conftest.$ac_ext >&5
-+
-+	ac_header_compiler=no
-+fi
-+
-+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-+{ echo "$as_me:$LINENO: result: $ac_header_compiler" >&5
-+echo "${ECHO_T}$ac_header_compiler" >&6; }
-+
-+# Is the header present?
-+{ echo "$as_me:$LINENO: checking $ac_header presence" >&5
-+echo $ECHO_N "checking $ac_header presence... $ECHO_C" >&6; }
-+cat >conftest.$ac_ext <<_ACEOF
-+/* confdefs.h.  */
-+_ACEOF
-+cat confdefs.h >>conftest.$ac_ext
-+cat >>conftest.$ac_ext <<_ACEOF
-+/* end confdefs.h.  */
-+#include <$ac_header>
-+_ACEOF
-+if { (ac_try="$ac_cpp conftest.$ac_ext"
-+case "(($ac_try" in
-+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+  *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+  (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1
-+  ac_status=$?
-+  grep -v '^ *+' conftest.er1 >conftest.err
-+  rm -f conftest.er1
-+  cat conftest.err >&5
-+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+  (exit $ac_status); } >/dev/null && {
-+	 test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" ||
-+	 test ! -s conftest.err
-+       }; then
-+  ac_header_preproc=yes
-+else
-+  echo "$as_me: failed program was:" >&5
-+sed 's/^/| /' conftest.$ac_ext >&5
-+
-+  ac_header_preproc=no
-+fi
-+
-+rm -f conftest.err conftest.$ac_ext
-+{ echo "$as_me:$LINENO: result: $ac_header_preproc" >&5
-+echo "${ECHO_T}$ac_header_preproc" >&6; }
-+
-+# So?  What about this header?
-+case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in
-+  yes:no: )
-+    { echo "$as_me:$LINENO: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&5
-+echo "$as_me: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&2;}
-+    { echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the compiler's result" >&5
-+echo "$as_me: WARNING: $ac_header: proceeding with the compiler's result" >&2;}
-+    ac_header_preproc=yes
-+    ;;
-+  no:yes:* )
-+    { echo "$as_me:$LINENO: WARNING: $ac_header: present but cannot be compiled" >&5
-+echo "$as_me: WARNING: $ac_header: present but cannot be compiled" >&2;}
-+    { echo "$as_me:$LINENO: WARNING: $ac_header:     check for missing prerequisite headers?" >&5
-+echo "$as_me: WARNING: $ac_header:     check for missing prerequisite headers?" >&2;}
-+    { echo "$as_me:$LINENO: WARNING: $ac_header: see the Autoconf documentation" >&5
-+echo "$as_me: WARNING: $ac_header: see the Autoconf documentation" >&2;}
-+    { echo "$as_me:$LINENO: WARNING: $ac_header:     section \"Present But Cannot Be Compiled\"" >&5
-+echo "$as_me: WARNING: $ac_header:     section \"Present But Cannot Be Compiled\"" >&2;}
-+    { echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the preprocessor's result" >&5
-+echo "$as_me: WARNING: $ac_header: proceeding with the preprocessor's result" >&2;}
-+    { echo "$as_me:$LINENO: WARNING: $ac_header: in the future, the compiler will take precedence" >&5
-+echo "$as_me: WARNING: $ac_header: in the future, the compiler will take precedence" >&2;}
-+    ( cat <<\_ASBOX
-+## ----------------------------- ##
-+## Report this to david@fubar.dk ##
-+## ----------------------------- ##
-+_ASBOX
-+     ) | sed "s/^/$as_me: WARNING:     /" >&2
-+    ;;
-+esac
-+{ echo "$as_me:$LINENO: checking for $ac_header" >&5
-+echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6; }
-+if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
-+  echo $ECHO_N "(cached) $ECHO_C" >&6
-+else
-+  eval "$as_ac_Header=\$ac_header_preproc"
-+fi
-+ac_res=`eval echo '${'$as_ac_Header'}'`
-+	       { echo "$as_me:$LINENO: result: $ac_res" >&5
-+echo "${ECHO_T}$ac_res" >&6; }
-+
-+fi
-+if test `eval echo '${'$as_ac_Header'}'` = yes; then
-+  cat >>confdefs.h <<_ACEOF
-+#define `echo "HAVE_$ac_header" | $as_tr_cpp` 1
-+_ACEOF
-+ have_inotify=yes
-+fi
-+
-+done
-+
-+
-+ if test "x$have_inotify" = "xyes"; then
-+  HAVE_INOTIFY_TRUE=
-+  HAVE_INOTIFY_FALSE='#'
-+else
-+  HAVE_INOTIFY_TRUE='#'
-+  HAVE_INOTIFY_FALSE=
-+fi
-+
-+
-+if test "x$have_inotify" = "xyes" ; then
-+
-+cat >>confdefs.h <<\_ACEOF
-+#define HAVE_INOTIFY 1
-+_ACEOF
-+
-+fi
-+
-+have_kqueue=yes
-+
-+for ac_func in kqueue
-+do
-+as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh`
-+{ echo "$as_me:$LINENO: checking for $ac_func" >&5
-+echo $ECHO_N "checking for $ac_func... $ECHO_C" >&6; }
-+if { as_var=$as_ac_var; eval "test \"\${$as_var+set}\" = set"; }; then
-+  echo $ECHO_N "(cached) $ECHO_C" >&6
-+else
-+  cat >conftest.$ac_ext <<_ACEOF
-+/* confdefs.h.  */
-+_ACEOF
-+cat confdefs.h >>conftest.$ac_ext
-+cat >>conftest.$ac_ext <<_ACEOF
-+/* end confdefs.h.  */
-+/* Define $ac_func to an innocuous variant, in case <limits.h> declares $ac_func.
-+   For example, HP-UX 11i <limits.h> declares gettimeofday.  */
-+#define $ac_func innocuous_$ac_func
-+
-+/* System header to define __stub macros and hopefully few prototypes,
-+    which can conflict with char $ac_func (); below.
-+    Prefer <limits.h> to <assert.h> if __STDC__ is defined, since
-+    <limits.h> exists even on freestanding compilers.  */
-+
-+#ifdef __STDC__
-+# include <limits.h>
-+#else
-+# include <assert.h>
-+#endif
-+
-+#undef $ac_func
-+
-+/* Override any GCC internal prototype to avoid an error.
-+   Use char because int might match the return type of a GCC
-+   builtin and then its argument prototype would still apply.  */
-+#ifdef __cplusplus
-+extern "C"
-+#endif
-+char $ac_func ();
-+/* The GNU C library defines this for functions which it implements
-+    to always fail with ENOSYS.  Some functions are actually named
-+    something starting with __ and the normal name is an alias.  */
-+#if defined __stub_$ac_func || defined __stub___$ac_func
-+choke me
-+#endif
-+
-+int
-+main ()
-+{
-+return $ac_func ();
-+  ;
-+  return 0;
-+}
-+_ACEOF
-+rm -f conftest.$ac_objext conftest$ac_exeext
-+if { (ac_try="$ac_link"
-+case "(($ac_try" in
-+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+  *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+  (eval "$ac_link") 2>conftest.er1
-+  ac_status=$?
-+  grep -v '^ *+' conftest.er1 >conftest.err
-+  rm -f conftest.er1
-+  cat conftest.err >&5
-+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+  (exit $ac_status); } && {
-+	 test -z "$ac_c_werror_flag" ||
-+	 test ! -s conftest.err
-+       } && test -s conftest$ac_exeext &&
-+       $as_test_x conftest$ac_exeext; then
-+  eval "$as_ac_var=yes"
-+else
-+  echo "$as_me: failed program was:" >&5
-+sed 's/^/| /' conftest.$ac_ext >&5
-+
-+	eval "$as_ac_var=no"
-+fi
-+
-+rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
-+      conftest$ac_exeext conftest.$ac_ext
-+fi
-+ac_res=`eval echo '${'$as_ac_var'}'`
-+	       { echo "$as_me:$LINENO: result: $ac_res" >&5
-+echo "${ECHO_T}$ac_res" >&6; }
-+if test `eval echo '${'$as_ac_var'}'` = yes; then
-+  cat >>confdefs.h <<_ACEOF
-+#define `echo "HAVE_$ac_func" | $as_tr_cpp` 1
-+_ACEOF
-+
-+else
-+  have_kqueue=no
-+fi
-+done
-+
-+
-+ if test "x$have_kqueue" = "xyes"; then
-+  HAVE_KQUEUE_TRUE=
-+  HAVE_KQUEUE_FALSE='#'
-+else
-+  HAVE_KQUEUE_TRUE='#'
-+  HAVE_KQUEUE_FALSE=
-+fi
-+
-+
-+if test "x$have_kqueue" = "xyes" ; then
-+
-+cat >>confdefs.h <<\_ACEOF
-+#define HAVE_KQUEUE 1
-+_ACEOF
-+
-+fi
-+
- # ********************
- # Internationalisation
- # ********************
-@@ -26232,6 +26677,27 @@ echo "$as_me: error: conditional \"OS_TY
- Usually this means the macro was only invoked conditionally." >&2;}
-    { (exit 1); exit 1; }; }
- fi
-+if test -z "${OS_TYPE_FREEBSD_TRUE}" && test -z "${OS_TYPE_FREEBSD_FALSE}"; then
-+  { { echo "$as_me:$LINENO: error: conditional \"OS_TYPE_FREEBSD\" was never defined.
-+Usually this means the macro was only invoked conditionally." >&5
-+echo "$as_me: error: conditional \"OS_TYPE_FREEBSD\" was never defined.
-+Usually this means the macro was only invoked conditionally." >&2;}
-+   { (exit 1); exit 1; }; }
-+fi
-+if test -z "${HAVE_INOTIFY_TRUE}" && test -z "${HAVE_INOTIFY_FALSE}"; then
-+  { { echo "$as_me:$LINENO: error: conditional \"HAVE_INOTIFY\" was never defined.
-+Usually this means the macro was only invoked conditionally." >&5
-+echo "$as_me: error: conditional \"HAVE_INOTIFY\" was never defined.
-+Usually this means the macro was only invoked conditionally." >&2;}
-+   { (exit 1); exit 1; }; }
-+fi
-+if test -z "${HAVE_KQUEUE_TRUE}" && test -z "${HAVE_KQUEUE_FALSE}"; then
-+  { { echo "$as_me:$LINENO: error: conditional \"HAVE_KQUEUE\" was never defined.
-+Usually this means the macro was only invoked conditionally." >&5
-+echo "$as_me: error: conditional \"HAVE_KQUEUE\" was never defined.
-+Usually this means the macro was only invoked conditionally." >&2;}
-+   { (exit 1); exit 1; }; }
-+fi
- 
-   ac_config_commands="$ac_config_commands po/stamp-it"
- 
-@@ -26995,10 +27461,16 @@ OS_TYPE_GENTOO_TRUE!$OS_TYPE_GENTOO_TRUE
- OS_TYPE_GENTOO_FALSE!$OS_TYPE_GENTOO_FALSE$ac_delim
- OS_TYPE_PARDUS_TRUE!$OS_TYPE_PARDUS_TRUE$ac_delim
- OS_TYPE_PARDUS_FALSE!$OS_TYPE_PARDUS_FALSE$ac_delim
-+OS_TYPE_FREEBSD_TRUE!$OS_TYPE_FREEBSD_TRUE$ac_delim
-+OS_TYPE_FREEBSD_FALSE!$OS_TYPE_FREEBSD_FALSE$ac_delim
- PAM_FILE_INCLUDE_AUTH!$PAM_FILE_INCLUDE_AUTH$ac_delim
- PAM_FILE_INCLUDE_ACCOUNT!$PAM_FILE_INCLUDE_ACCOUNT$ac_delim
- PAM_FILE_INCLUDE_PASSWORD!$PAM_FILE_INCLUDE_PASSWORD$ac_delim
- PAM_FILE_INCLUDE_SESSION!$PAM_FILE_INCLUDE_SESSION$ac_delim
-+HAVE_INOTIFY_TRUE!$HAVE_INOTIFY_TRUE$ac_delim
-+HAVE_INOTIFY_FALSE!$HAVE_INOTIFY_FALSE$ac_delim
-+HAVE_KQUEUE_TRUE!$HAVE_KQUEUE_TRUE$ac_delim
-+HAVE_KQUEUE_FALSE!$HAVE_KQUEUE_FALSE$ac_delim
- INTLTOOL_DESKTOP_RULE!$INTLTOOL_DESKTOP_RULE$ac_delim
- INTLTOOL_DIRECTORY_RULE!$INTLTOOL_DIRECTORY_RULE$ac_delim
- INTLTOOL_KEYS_RULE!$INTLTOOL_KEYS_RULE$ac_delim
-@@ -27022,12 +27494,6 @@ INTLTOOL_EXTRACT!$INTLTOOL_EXTRACT$ac_de
- INTLTOOL_MERGE!$INTLTOOL_MERGE$ac_delim
- INTLTOOL_UPDATE!$INTLTOOL_UPDATE$ac_delim
- INTLTOOL_PERL!$INTLTOOL_PERL$ac_delim
--ALL_LINGUAS!$ALL_LINGUAS$ac_delim
--DATADIRNAME!$DATADIRNAME$ac_delim
--GETTEXT_PACKAGE!$GETTEXT_PACKAGE$ac_delim
--USE_NLS!$USE_NLS$ac_delim
--MSGFMT!$MSGFMT$ac_delim
--MSGFMT_OPTS!$MSGFMT_OPTS$ac_delim
- _ACEOF
- 
-   if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed | grep -c X` = 97; then
-@@ -27069,6 +27535,12 @@ _ACEOF
- ac_delim='%!_!# '
- for ac_last_try in false false false false false :; do
-   cat >conf$$subs.sed <<_ACEOF
-+ALL_LINGUAS!$ALL_LINGUAS$ac_delim
-+DATADIRNAME!$DATADIRNAME$ac_delim
-+GETTEXT_PACKAGE!$GETTEXT_PACKAGE$ac_delim
-+USE_NLS!$USE_NLS$ac_delim
-+MSGFMT!$MSGFMT$ac_delim
-+MSGFMT_OPTS!$MSGFMT_OPTS$ac_delim
- GMSGFMT!$GMSGFMT$ac_delim
- XGETTEXT!$XGETTEXT$ac_delim
- CATALOGS!$CATALOGS$ac_delim
-@@ -27085,7 +27557,7 @@ LIBOBJS!$LIBOBJS$ac_delim
- LTLIBOBJS!$LTLIBOBJS$ac_delim
- _ACEOF
- 
--  if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed | grep -c X` = 14; then
-+  if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed | grep -c X` = 20; then
-     break
-   elif $ac_last_try; then
-     { { echo "$as_me:$LINENO: error: could not make $CONFIG_STATUS" >&5
diff --git a/sysutils/policykit/files/patch-configure.in b/sysutils/policykit/files/patch-configure.in
deleted file mode 100644
index d54068c95..000000000
--- a/sysutils/policykit/files/patch-configure.in
+++ /dev/null
@@ -1,57 +0,0 @@
---- configure.in.orig	2007-11-25 15:43:40.000000000 -0500
-+++ configure.in	2007-12-23 00:34:37.000000000 -0500
-@@ -169,7 +169,7 @@ PKG_CHECK_MODULES(DBUS_GLIB, [dbus-glib-
- AC_SUBST(DBUS_GLIB_CFLAGS)
- AC_SUBST(DBUS_GLIB_LIBS)
- 
--AC_CHECK_FUNCS(getgrouplist)
-+AC_CHECK_FUNCS(getgrouplist clearenv strndup getline readdir64)
- 
- EXPAT_LIB=""
- AC_ARG_WITH(expat, [  --with-expat=<dir>      Use expat from here],
-@@ -406,6 +406,7 @@ AM_CONDITIONAL(OS_TYPE_RED_HAT, test x$w
- AM_CONDITIONAL(OS_TYPE_SUSE, test x$with_os_type = xsuse, [Running on SUSE OS'es])
- AM_CONDITIONAL(OS_TYPE_GENTOO, test x$with_os_type = xgentoo, [Running on Gentoo OS'es])
- AM_CONDITIONAL(OS_TYPE_PARDUS, test x$with_os_type = xpardus, [Running on Pardus OS'es])
-+AM_CONDITIONAL(OS_TYPE_FREEBSD, test x$with_os_type = xfreebsd, [Running on FreeBSD OS'es])
- 
- AC_ARG_WITH(pam-include, [  --with-pam-include=<file>  pam file to include])
- 
-@@ -425,6 +426,11 @@ elif test x$with_os_type = xsuse ; then
-    PAM_FILE_INCLUDE_ACCOUNT=common-account
-    PAM_FILE_INCLUDE_PASSWORD=common-password
-    PAM_FILE_INCLUDE_SESSION=common-session
-+elif test x$with_os_type = xfreebsd ; then
-+    PAM_FILE_INCLUDE_AUTH=system
-+    PAM_FILE_INCLUDE_ACCOUNT=system
-+    PAM_FILE_INCLUDE_PASSWORD=system
-+    PAM_FILE_INCLUDE_SESSION=system
- else
-    PAM_FILE_INCLUDE_AUTH=system-auth
-    PAM_FILE_INCLUDE_ACCOUNT=system-auth
-@@ -441,6 +447,25 @@ AC_DEFINE_UNQUOTED(PAM_FILE_INCLUDE_ACCO
- AC_DEFINE_UNQUOTED(PAM_FILE_INCLUDE_PASSWORD, "$PAM_FILE_INCLUDE_PASSWORD", [pam file password])
- AC_DEFINE_UNQUOTED(PAM_FILE_INCLUDE_SESSION, "$PAM_FILE_INCLUDE_SESSION", [pam file session])
- 
-+have_inotify=no
-+AC_CHECK_HEADERS([linux/inotify.h], [have_inotify=yes])
-+AC_CHECK_HEADERS([sys/inotify.h], [have_inotify=yes])
-+
-+AM_CONDITIONAL(HAVE_INOTIFY, test "x$have_inotify" = "xyes")
-+
-+if test "x$have_inotify" = "xyes" ; then
-+    AC_DEFINE([HAVE_INOTIFY], 1, [Enable Linux inotify() usage])
-+fi
-+
-+have_kqueue=yes
-+AC_CHECK_FUNCS([kqueue],,have_kqueue=no)
-+
-+AM_CONDITIONAL(HAVE_KQUEUE, test "x$have_kqueue" = "xyes")
-+
-+if test "x$have_kqueue" = "xyes" ; then
-+    AC_DEFINE([HAVE_KQUEUE], 1, [Enable BSD kqueue() usage])
-+fi
-+
- # ********************
- # Internationalisation
- # ********************
diff --git a/sysutils/policykit/files/patch-data_Makefile.in b/sysutils/policykit/files/patch-data_Makefile.in
deleted file mode 100644
index f32ab19c0..000000000
--- a/sysutils/policykit/files/patch-data_Makefile.in
+++ /dev/null
@@ -1,25 +0,0 @@
---- data/Makefile.in.orig	2008-01-07 23:51:57.000000000 -0500
-+++ data/Makefile.in	2008-01-07 23:52:15.000000000 -0500
-@@ -305,14 +305,14 @@ mostlyclean-libtool:
- clean-libtool:
- 	-rm -rf .libs _libs
- install-confDATA: $(conf_DATA)
--	@$(NORMAL_INSTALL)
--	test -z "$(confdir)" || $(MKDIR_P) "$(DESTDIR)$(confdir)"
--	@list='$(conf_DATA)'; for p in $$list; do \
--	  if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
--	  f=$(am__strip_dir) \
--	  echo " $(confDATA_INSTALL) '$$d$$p' '$(DESTDIR)$(confdir)/$$f'"; \
--	  $(confDATA_INSTALL) "$$d$$p" "$(DESTDIR)$(confdir)/$$f"; \
--	done
-+#	@$(NORMAL_INSTALL)
-+#	test -z "$(confdir)" || $(MKDIR_P) "$(DESTDIR)$(confdir)"
-+#	@list='$(conf_DATA)'; for p in $$list; do \
-+#	  if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
-+#	  f=$(am__strip_dir) \
-+#	  echo " $(confDATA_INSTALL) '$$d$$p' '$(DESTDIR)$(confdir)/$$f'"; \
-+#	  $(confDATA_INSTALL) "$$d$$p" "$(DESTDIR)$(confdir)/$$f"; \
-+#	done
- 
- uninstall-confDATA:
- 	@$(NORMAL_UNINSTALL)
diff --git a/sysutils/policykit/files/patch-src_kit_kit-file.c b/sysutils/policykit/files/patch-src_kit_kit-file.c
deleted file mode 100644
index af3ffe0f4..000000000
--- a/sysutils/policykit/files/patch-src_kit_kit-file.c
+++ /dev/null
@@ -1,26 +0,0 @@
---- src/kit/kit-file.c.orig	2007-11-28 16:32:08.000000000 -0500
-+++ src/kit/kit-file.c	2007-12-24 14:48:35.000000000 -0500
-@@ -283,7 +283,11 @@ _kit_get_num_fd (void)
-         DIR *dir;
-         char buf[128];
-         ssize_t num;
-+#ifdef HAVE_READDIR64
-         struct dirent64 *d;
-+#else
-+	struct dirent *d;
-+#endif
- 
-         num = -1;
- 
-@@ -296,7 +300,11 @@ _kit_get_num_fd (void)
-         }
- 
-         num = -2;
-+#ifdef HAVE_READDIR64
-         while ((d = readdir64 (dir)) != NULL) {
-+#else
-+	while ((d = readdir (dir)) != NULL) {
-+#endif
-                 if (d->d_name == NULL)
-                         continue;
-                 num++;
diff --git a/sysutils/policykit/files/patch-src_kit_kit-file.h b/sysutils/policykit/files/patch-src_kit_kit-file.h
deleted file mode 100644
index ae2a2ac71..000000000
--- a/sysutils/policykit/files/patch-src_kit_kit-file.h
+++ /dev/null
@@ -1,10 +0,0 @@
---- src/kit/kit-file.h.orig	2007-12-22 19:14:03.000000000 -0500
-+++ src/kit/kit-file.h	2007-12-22 19:14:13.000000000 -0500
-@@ -34,6 +34,7 @@
- #ifndef KIT_FILE_H
- #define KIT_FILE_H
- 
-+#include <sys/stat.h>
- #include <kit/kit.h>
- 
- KIT_BEGIN_DECLS
diff --git a/sysutils/policykit/files/patch-src_kit_kit-spawn.c b/sysutils/policykit/files/patch-src_kit_kit-spawn.c
deleted file mode 100644
index 7fbee5ec7..000000000
--- a/sysutils/policykit/files/patch-src_kit_kit-spawn.c
+++ /dev/null
@@ -1,10 +0,0 @@
---- src/kit/kit-spawn.c.orig	2007-12-23 00:22:49.000000000 -0500
-+++ src/kit/kit-spawn.c	2007-12-23 00:22:58.000000000 -0500
-@@ -40,6 +40,7 @@
- #include <unistd.h>
- #include <fcntl.h>
- #include <errno.h>
-+#include <signal.h>
- 
- #include <kit/kit.h>
- #include "kit-test.h"
diff --git a/sysutils/policykit/files/patch-src_kit_kit-string.c b/sysutils/policykit/files/patch-src_kit_kit-string.c
deleted file mode 100644
index e7b375e05..000000000
--- a/sysutils/policykit/files/patch-src_kit_kit-string.c
+++ /dev/null
@@ -1,42 +0,0 @@
---- src/kit/kit-string.c.orig	2007-12-23 00:42:03.000000000 -0500
-+++ src/kit/kit-string.c	2007-12-23 00:41:26.000000000 -0500
-@@ -77,7 +77,15 @@ kit_strdup (const char *s)
- out:
-         return p;
- }
-+#else /* !KIT_BUILD_TESTS */
-+char *
-+kit_strdup (const char *s)
-+{
-+        return strdup (s);
-+}
-+#endif /* KIT_BUILD_TESTS */
- 
-+#if defined(KIT_BUILD_TESTS) || !defined(HAVE_STRNDUP)
- /**
-  * kit_strndup:
-  * @s: string
-@@ -111,13 +119,7 @@ out:
-         return p;
- }
- 
--#else
--
--char *
--kit_strdup (const char *s)
--{
--        return strdup (s);
--}
-+#else /* !KIT_BUILD_TESTS || HAVE_STRNDUP */
- 
- char *
- kit_strndup (const char *s, size_t n)
-@@ -125,7 +127,7 @@ kit_strndup (const char *s, size_t n)
-         return strndup (s, n);
- }
- 
--#endif /* KIT_BUILD_TESTS */
-+#endif /* KIT_BUILD_TESTS || !HAVE_STRNDUP */
- 
- /**
-  * kit_strdup_printf:
diff --git a/sysutils/policykit/files/patch-src_polkit-dbus_polkit-read-auth-helper.c b/sysutils/policykit/files/patch-src_polkit-dbus_polkit-read-auth-helper.c
deleted file mode 100644
index d9351cea6..000000000
--- a/sysutils/policykit/files/patch-src_polkit-dbus_polkit-read-auth-helper.c
+++ /dev/null
@@ -1,43 +0,0 @@
---- src/polkit-dbus/polkit-read-auth-helper.c.orig	2007-11-28 23:33:10.000000000 -0500
-+++ src/polkit-dbus/polkit-read-auth-helper.c	2007-12-24 14:53:38.000000000 -0500
-@@ -39,6 +39,7 @@
- #include <string.h>
- #include <unistd.h>
- #include <sys/types.h>
-+#include <sys/param.h>
- #include <sys/stat.h>
- #include <security/pam_appl.h>
- #include <grp.h>
-@@ -156,7 +157,11 @@ dump_auths_all (const char *root)
- {
-         DIR *dir;
-         int dfd;
-+#ifdef HAVE_READDIR64
-         struct dirent64 *d;
-+#else
-+	struct dirent *d;
-+#endif
-         polkit_bool_t ret;
- 
-         ret = FALSE;
-@@ -173,7 +178,11 @@ dump_auths_all (const char *root)
-                 goto out;
-         }
- 
-+#ifdef HAVE_READDIR64
-         while ((d = readdir64(dir)) != NULL) {
-+#else
-+	while ((d = readdir(dir)) != NULL) {
-+#endif
-                 unsigned int n, m;
-                 uid_t uid;
-                 size_t name_len;
-@@ -282,7 +291,7 @@ main (int argc, char *argv[])
- 
- #ifndef POLKIT_BUILD_TESTS
-         /* clear the entire environment to avoid attacks using with libraries honoring environment variables */
--        if (clearenv () != 0)
-+        if (polkit_sysdeps_clearenv () != 0)
-                 goto out;
-         /* set a minimal environment */
-         setenv ("PATH", "/usr/sbin:/usr/bin:/sbin:/bin", 1);
diff --git a/sysutils/policykit/files/patch-src_polkit-dbus_polkit-set-default-helper.c b/sysutils/policykit/files/patch-src_polkit-dbus_polkit-set-default-helper.c
deleted file mode 100644
index 8361f7c0b..000000000
--- a/sysutils/policykit/files/patch-src_polkit-dbus_polkit-set-default-helper.c
+++ /dev/null
@@ -1,11 +0,0 @@
---- src/polkit-dbus/polkit-set-default-helper.c.orig	2007-12-23 01:21:04.000000000 -0500
-+++ src/polkit-dbus/polkit-set-default-helper.c	2007-12-23 01:21:11.000000000 -0500
-@@ -127,7 +127,7 @@ main (int argc, char *argv[])
- 
-         ret = 1;
-         /* clear the entire environment to avoid attacks using with libraries honoring environment variables */
--        if (clearenv () != 0)
-+        if (polkit_sysdeps_clearenv () != 0)
-                 goto out;
-         /* set a minimal environment */
-         setenv ("PATH", "/usr/sbin:/usr/bin:/sbin:/bin", 1);
diff --git a/sysutils/policykit/files/patch-src_polkit-grant_Makefile.am b/sysutils/policykit/files/patch-src_polkit-grant_Makefile.am
deleted file mode 100644
index 73f38d381..000000000
--- a/sysutils/policykit/files/patch-src_polkit-grant_Makefile.am
+++ /dev/null
@@ -1,11 +0,0 @@
---- src/polkit-grant/Makefile.am.orig	2007-12-23 01:40:02.000000000 -0500
-+++ src/polkit-grant/Makefile.am	2007-12-23 01:40:27.000000000 -0500
-@@ -47,7 +47,7 @@ polkit_grant_helper_SOURCES = polkit-gra
- polkit_grant_helper_LDADD = @GLIB_LIBS@ @DBUS_LIBS@ $(top_builddir)/src/polkit/libpolkit.la $(top_builddir)/src/polkit-dbus/libpolkit-dbus.la libpolkit-grant.la
- 
- polkit_grant_helper_pam_SOURCES = polkit-grant-helper-pam.c
--polkit_grant_helper_pam_LDADD = @AUTH_LIBS@
-+polkit_grant_helper_pam_LDADD = @AUTH_LIBS@ $(top_builddir)/src/polkit/libpolkit.la
- 
- polkit_explicit_grant_helper_SOURCES = polkit-explicit-grant-helper.c
- polkit_explicit_grant_helper_CFLAGS = @DBUS_CFLAGS@
diff --git a/sysutils/policykit/files/patch-src_polkit-grant_Makefile.in b/sysutils/policykit/files/patch-src_polkit-grant_Makefile.in
deleted file mode 100644
index 6723a3a12..000000000
--- a/sysutils/policykit/files/patch-src_polkit-grant_Makefile.in
+++ /dev/null
@@ -1,11 +0,0 @@
---- src/polkit-grant/Makefile.in.orig	2007-12-23 01:40:49.000000000 -0500
-+++ src/polkit-grant/Makefile.in	2007-12-23 01:41:16.000000000 -0500
-@@ -351,7 +351,7 @@ libpolkit_grant_la_LDFLAGS = -version-in
- @POLKIT_AUTHDB_DEFAULT_TRUE@polkit_grant_helper_SOURCES = polkit-grant-helper.c
- @POLKIT_AUTHDB_DEFAULT_TRUE@polkit_grant_helper_LDADD = @GLIB_LIBS@ @DBUS_LIBS@ $(top_builddir)/src/polkit/libpolkit.la $(top_builddir)/src/polkit-dbus/libpolkit-dbus.la libpolkit-grant.la
- @POLKIT_AUTHDB_DEFAULT_TRUE@polkit_grant_helper_pam_SOURCES = polkit-grant-helper-pam.c
--@POLKIT_AUTHDB_DEFAULT_TRUE@polkit_grant_helper_pam_LDADD = @AUTH_LIBS@
-+@POLKIT_AUTHDB_DEFAULT_TRUE@polkit_grant_helper_pam_LDADD = @AUTH_LIBS@ $(top_builddir)/src/polkit/libpolkit.la
- @POLKIT_AUTHDB_DEFAULT_TRUE@polkit_explicit_grant_helper_SOURCES = polkit-explicit-grant-helper.c
- @POLKIT_AUTHDB_DEFAULT_TRUE@polkit_explicit_grant_helper_CFLAGS = @DBUS_CFLAGS@
- @POLKIT_AUTHDB_DEFAULT_TRUE@polkit_explicit_grant_helper_LDADD = $(top_builddir)/src/polkit/libpolkit.la $(top_builddir)/src/polkit-dbus/libpolkit-dbus.la libpolkit-grant.la
diff --git a/sysutils/policykit/files/patch-src_polkit-grant_polkit-explicit-grant-helper.c b/sysutils/policykit/files/patch-src_polkit-grant_polkit-explicit-grant-helper.c
deleted file mode 100644
index cf9689c67..000000000
--- a/sysutils/policykit/files/patch-src_polkit-grant_polkit-explicit-grant-helper.c
+++ /dev/null
@@ -1,11 +0,0 @@
---- src/polkit-grant/polkit-explicit-grant-helper.c.orig	2007-12-23 01:24:19.000000000 -0500
-+++ src/polkit-grant/polkit-explicit-grant-helper.c	2007-12-23 01:24:24.000000000 -0500
-@@ -67,7 +67,7 @@ main (int argc, char *argv[])
-         ret = 1;
- 
-         /* clear the entire environment to avoid attacks using with libraries honoring environment variables */
--        if (clearenv () != 0)
-+        if (polkit_sysdeps_clearenv () != 0)
-                 goto out;
-         /* set a minimal environment */
-         setenv ("PATH", "/usr/sbin:/usr/bin:/sbin:/bin", 1);
diff --git a/sysutils/policykit/files/patch-src_polkit-grant_polkit-grant-helper-pam.c b/sysutils/policykit/files/patch-src_polkit-grant_polkit-grant-helper-pam.c
deleted file mode 100644
index bb957f167..000000000
--- a/sysutils/policykit/files/patch-src_polkit-grant_polkit-grant-helper-pam.c
+++ /dev/null
@@ -1,20 +0,0 @@
---- src/polkit-grant/polkit-grant-helper-pam.c.orig	2007-11-28 16:28:31.000000000 -0500
-+++ src/polkit-grant/polkit-grant-helper-pam.c	2007-12-23 02:01:46.000000000 -0500
-@@ -38,6 +38,8 @@
- #include <syslog.h>
- #include <security/pam_appl.h>
- 
-+#include <polkit/polkit.h>
-+
- /* Development aid: define PGH_DEBUG to get debugging output. Do _NOT_
-  * enable this in production builds; it may leak passwords and other
-  * sensitive information.
-@@ -60,7 +62,7 @@ main (int argc, char *argv[])
-         pam_h = NULL;
- 
-         /* clear the entire environment to avoid attacks using with libraries honoring environment variables */
--        if (clearenv () != 0)
-+        if (polkit_sysdeps_clearenv () != 0)
-                 goto error;
-         /* set a minimal environment */
-         setenv ("PATH", "/usr/sbin:/usr/bin:/sbin:/bin", 1);
diff --git a/sysutils/policykit/files/patch-src_polkit-grant_polkit-grant-helper.c b/sysutils/policykit/files/patch-src_polkit-grant_polkit-grant-helper.c
deleted file mode 100644
index 0cab8899c..000000000
--- a/sysutils/policykit/files/patch-src_polkit-grant_polkit-grant-helper.c
+++ /dev/null
@@ -1,11 +0,0 @@
---- src/polkit-grant/polkit-grant-helper.c.orig	2007-12-23 01:23:13.000000000 -0500
-+++ src/polkit-grant/polkit-grant-helper.c	2007-12-23 01:23:19.000000000 -0500
-@@ -546,7 +546,7 @@ main (int argc, char *argv[])
-         ret = 3;
- 
-         /* clear the entire environment to avoid attacks using with libraries honoring environment variables */
--        if (clearenv () != 0)
-+        if (polkit_sysdeps_clearenv () != 0)
-                 goto out;
-         /* set a minimal environment */
-         setenv ("PATH", "/usr/sbin:/usr/bin:/sbin:/bin", 1);
diff --git a/sysutils/policykit/files/patch-src_polkit-grant_polkit-grant.c b/sysutils/policykit/files/patch-src_polkit-grant_polkit-grant.c
deleted file mode 100644
index c377b9614..000000000
--- a/sysutils/policykit/files/patch-src_polkit-grant_polkit-grant.c
+++ /dev/null
@@ -1,19 +0,0 @@
---- src/polkit-grant/polkit-grant.c.orig	2007-11-28 16:29:25.000000000 -0500
-+++ src/polkit-grant/polkit-grant.c	2007-12-23 01:25:08.000000000 -0500
-@@ -38,6 +38,7 @@
- #include <sys/types.h>
- #include <unistd.h>
- #include <sys/wait.h>
-+#include <signal.h>
- 
- #include <glib.h>
- #include "polkit-grant.h"
-@@ -301,7 +302,7 @@ polkit_grant_io_func (PolKitGrant *polki
-         g_return_if_fail (polkit_grant != NULL);
-         g_return_if_fail (polkit_grant->helper_is_running);
- 
--        while (getline (&line, &line_len, polkit_grant->child_stdout_f) != -1) {
-+        while (polkit_sysdeps_getline (&line, &line_len, polkit_grant->child_stdout_f) != -1) {
-                 if (strlen (line) > 0 &&
-                     line[strlen (line) - 1] == '\n')
-                         line[strlen (line) - 1] = '\0';
diff --git a/sysutils/policykit/files/patch-src_polkit-grant_polkit-revoke-helper.c b/sysutils/policykit/files/patch-src_polkit-grant_polkit-revoke-helper.c
deleted file mode 100644
index c0ff4b64a..000000000
--- a/sysutils/policykit/files/patch-src_polkit-grant_polkit-revoke-helper.c
+++ /dev/null
@@ -1,11 +0,0 @@
---- src/polkit-grant/polkit-revoke-helper.c.orig	2007-12-23 01:22:38.000000000 -0500
-+++ src/polkit-grant/polkit-revoke-helper.c	2007-12-23 01:22:47.000000000 -0500
-@@ -109,7 +109,7 @@ main (int argc, char *argv[])
- 
- #ifndef POLKIT_BUILD_TESTS
-         /* clear the entire environment to avoid attacks using with libraries honoring environment variables */
--        if (clearenv () != 0)
-+        if (polkit_sysdeps_clearenv () != 0)
-                 goto out;
-         /* set a minimal environment */
-         setenv ("PATH", "/usr/sbin:/usr/bin:/sbin:/bin", 1);
diff --git a/sysutils/policykit/files/patch-src_polkit_polkit-config.c b/sysutils/policykit/files/patch-src_polkit_polkit-config.c
deleted file mode 100644
index f5b2e0082..000000000
--- a/sysutils/policykit/files/patch-src_polkit_polkit-config.c
+++ /dev/null
@@ -1,10 +0,0 @@
---- src/polkit/polkit-config.c.orig	2007-12-23 00:25:46.000000000 -0500
-+++ src/polkit/polkit-config.c	2007-12-23 00:25:51.000000000 -0500
-@@ -39,7 +39,6 @@
- #include <grp.h>
- #include <unistd.h>
- #include <errno.h>
--#include <sys/inotify.h>
- #include <regex.h>
- #include <syslog.h>
- #include <regex.h>
diff --git a/sysutils/policykit/files/patch-src_polkit_polkit-context.c b/sysutils/policykit/files/patch-src_polkit_polkit-context.c
deleted file mode 100644
index b27cd8edd..000000000
--- a/sysutils/policykit/files/patch-src_polkit_polkit-context.c
+++ /dev/null
@@ -1,189 +0,0 @@
---- src/polkit/polkit-context.c.orig	2007-12-04 20:22:41.000000000 -0500
-+++ src/polkit/polkit-context.c	2007-12-23 00:24:45.000000000 -0500
-@@ -39,7 +39,13 @@
- #include <grp.h>
- #include <unistd.h>
- #include <errno.h>
-+#ifdef HAVE_INOTIFY
- #include <sys/inotify.h>
-+#elif HAVE_KQUEUE
-+#include <sys/event.h>
-+#include <sys/time.h>
-+#include <fcntl.h>
-+#endif
- #include <syslog.h>
- 
- #include "polkit-config.h"
-@@ -106,11 +112,19 @@ struct _PolKitContext
- 
-         polkit_bool_t load_descriptions;
- 
-+#ifdef HAVE_INOTIFY
-         int inotify_fd;
-         int inotify_fd_watch_id;
-         int inotify_config_wd;
-         int inotify_policy_wd;
-         int inotify_grant_perm_wd;
-+#elif HAVE_KQUEUE
-+	int kqueue_fd;
-+	int kqueue_fd_watch_id;
-+	int kqueue_config_fd;
-+	int kqueue_policy_fd;
-+	int kqueue_grant_perm_fd;
-+#endif
- };
- 
- /**
-@@ -144,6 +158,10 @@ polkit_context_new (void)
- polkit_bool_t
- polkit_context_init (PolKitContext *pk_context, PolKitError **error)
- {
-+#ifdef HAVE_KQUEUE
-+	struct kevent ev;
-+#endif
-+
-         kit_return_val_if_fail (pk_context != NULL, FALSE);
- 
-         pk_context->policy_dir = kit_strdup (PACKAGE_DATA_DIR "/PolicyKit/policy");
-@@ -153,6 +171,7 @@ polkit_context_init (PolKitContext *pk_c
- 
-         /* NOTE: we don't load the configuration file until it's needed */
- 
-+#ifdef HAVE_INOTIFY
-         if (pk_context->io_add_watch_func != NULL) {
-                 pk_context->inotify_fd = inotify_init ();
-                 if (pk_context->inotify_fd < 0) {
-@@ -203,6 +222,88 @@ polkit_context_init (PolKitContext *pk_c
-                         goto error;
-                 }
-         }
-+#elif HAVE_KQUEUE
-+	if (pk_context->io_add_watch_func != NULL) {
-+		pk_context->kqueue_fd = kqueue ();
-+		if (pk_context->kqueue_fd < 0) {
-+			_pk_debug ("failed to initialize kqueue: %s", strerror (errno));
-+			/* TODO: set error */
-+			goto error;
-+		}
-+
-+		/* Watch the /etc/PolicyKit/PolicyKit.conf file */
-+		pk_context->kqueue_config_fd = open (PACKAGE_SYSCONF_DIR "/PolicyKit/PolicyKit.conf", O_RDONLY);
-+		if (pk_context->kqueue_config_fd < 0) {
-+			_pk_debug ("failed '" PACKAGE_SYSCONF_DIR "/PolicyKit/PolicyKit.conf' for reading: %s",
-+				strerror (errno));
-+			/* TODO: set error */
-+			goto error;
-+		}
-+
-+		EV_SET (&ev, pk_context->kqueue_config_fd, EVFILT_VNODE,
-+			EV_ADD | EV_ENABLE | EV_CLEAR,
-+			NOTE_DELETE | NOTE_EXTEND | NOTE_WRITE | NOTE_RENAME,
-+			0, 0);
-+		if (kevent (pk_context->kqueue_fd, &ev, 1, NULL, 0, NULL) == -1) {
-+			_pk_debug ("failed to add watch on file '" PACKAGE_SYSCONF_DIR "/PolicyKit/PolicyKit.conf': %s",
-+				strerror (errno));
-+			close (pk_context->kqueue_config_fd);
-+			/* TODO: set error */
-+			goto error;
-+		}
-+
-+		/* Watch the /usr/share/PolicyKit/policy directory */
-+		pk_context->kqueue_policy_fd = open (PACKAGE_DATA_DIR "/PolicyKit/policy", O_RDONLY);
-+		if (pk_context->kqueue_policy_fd < 0) {
-+			_pk_debug ("failed to open '" PACKAGE_DATA_DIR "/PolicyKit/policy for reading: %s",
-+				strerror (errno));
-+			/* TODO: set error */
-+			goto error;
-+		}
-+
-+		EV_SET (&ev, pk_context->kqueue_policy_fd, EVFILT_VNODE,
-+			EV_ADD | EV_ENABLE | EV_CLEAR,
-+			NOTE_DELETE | NOTE_EXTEND | NOTE_WRITE | NOTE_RENAME,
-+			0, 0);
-+		if (kevent (pk_context->kqueue_fd, &ev, 1, NULL, 0, NULL) == -1) {
-+			_pk_debug ("failed to add watch on directory '" PACKAGE_DATA_DIR "/PolicyKit/policy': %s",
-+				strerror (errno));
-+			close (pk_context->kqueue_policy_fd);
-+			/* TODO: set error */
-+			goto error;
-+		}
-+
-+#ifdef POLKIT_AUTHDB_DEFAULT
-+		/* Watch the /var/lib/misc/PolicyKit.reload file */
-+		pk_context->kqueue_grant_perm_fd = open (PACKAGE_LOCALSTATE_DIR "/lib/misc/PolicyKit.reload", O_RDONLY);
-+		if (pk_context->kqueue_grant_perm_fd < 0) {
-+			_pk_debug ("failed to open '" PACKAGE_LOCALSTATE_DIR "/lib/misc/PolicyKit.reload' for reading: %s",
-+				strerror (errno));
-+			/* TODO: set error */
-+			goto error;
-+		}
-+
-+		EV_SET (&ev, pk_context->kqueue_grant_perm_fd, EVFILT_VNODE,
-+			EV_ADD | EV_ENABLE | EV_CLEAR,
-+			NOTE_DELETE | NOTE_EXTEND | NOTE_WRITE | NOTE_RENAME,
-+			0, 0);
-+		if (kevent (pk_context->kqueue_fd, &ev, 1, NULL, 0, NULL) == -1) {
-+			_pk_debug ("failed to add watch on file '" PACKAGE_LOCALSTATE_DIR "/lib/misc/PolicyKit.reload': %s",
-+				strerror (errno));
-+			close (pk_context->kqueue_grant_perm_fd);
-+			/* TODO: set error */
-+			goto error;
-+		}
-+#endif
-+
-+		pk_context->kqueue_fd_watch_id = pk_context->io_add_watch_func (pk_context, pk_context->kqueue_fd);
-+		if (pk_context->kqueue_fd_watch_id == 0) {
-+			_pk_debug ("failed to add io watch");
-+			/* TODO: set error */
-+			goto error;
-+		}
-+	}
-+#endif
- 
-         return TRUE;
- error:
-@@ -296,6 +397,7 @@ polkit_context_io_func (PolKitContext *p
- 
-         config_changed = FALSE;
- 
-+#ifdef HAVE_INOTIFY
-         if (fd == pk_context->inotify_fd) {
- /* size of the event structure, not counting name */
- #define EVENT_SIZE  (sizeof (struct inotify_event))
-@@ -327,6 +429,36 @@ again:
-                         i += EVENT_SIZE + event->len;
-                 }
-         }
-+#elif HAVE_KQUEUE
-+	if (fd == pk_context->kqueue_fd) {
-+		struct kevent ev[1024];
-+		struct timespec nullts = { 0, 0 };
-+		int res;
-+		int i = 0;
-+
-+		res = kevent (fd, NULL, 0, ev, 1024, &nullts);
-+
-+		if (res > 0) {
-+			/* Sleep for a half-second to avoid potential races
-+			 * during install/uninstall. */
-+			usleep (500000);
-+
-+			while (i < res) {
-+				struct kevent *evptr;
-+
-+				evptr = &ev[i];
-+				_pk_debug ("ident=%d filter=%d flags=%u fflags=%u",
-+					   evptr->ident, evptr->filter, evptr->flags, evptr->fflags);
-+				_pk_debug ("config changed!");
-+				config_changed = TRUE;
-+
-+				i++;
-+			}
-+		} else {
-+			_pk_debug ("failed to read kqueue event: %s", strerror (errno));
-+		}
-+	}
-+#endif
- 
-         if (config_changed) {
-                 polkit_context_force_reload (pk_context);
diff --git a/sysutils/policykit/files/patch-src_polkit_polkit-policy-cache.c b/sysutils/policykit/files/patch-src_polkit_polkit-policy-cache.c
deleted file mode 100644
index 793b53110..000000000
--- a/sysutils/policykit/files/patch-src_polkit_polkit-policy-cache.c
+++ /dev/null
@@ -1,26 +0,0 @@
---- src/polkit/polkit-policy-cache.c.orig	2007-11-29 01:14:09.000000000 -0500
-+++ src/polkit/polkit-policy-cache.c	2007-12-24 14:51:04.000000000 -0500
-@@ -98,7 +98,11 @@ PolKitPolicyCache *
- _polkit_policy_cache_new (const char *dirname, polkit_bool_t load_descriptions, PolKitError **error)
- {
-         DIR *dir;
-+#ifdef HAVE_READDIR64
-         struct dirent64 *d;
-+#else
-+	struct dirent *d;
-+#endif
-         PolKitPolicyCache *pc;
- 
-         dir = NULL;
-@@ -119,7 +123,11 @@ _polkit_policy_cache_new (const char *di
-                 goto out;
-         }
- 
-+#ifdef HAVE_READDIR64
-         while ((d = readdir64 (dir)) != NULL) {
-+#else
-+	while ((d = readdir (dir)) != NULL) {
-+#endif
-                 char *path;
-                 PolKitPolicyFile *pf;
-                 PolKitError *pk_error;
diff --git a/sysutils/policykit/files/patch-src_polkit_polkit-sysdeps.c b/sysutils/policykit/files/patch-src_polkit_polkit-sysdeps.c
deleted file mode 100644
index c8e4935f1..000000000
--- a/sysutils/policykit/files/patch-src_polkit_polkit-sysdeps.c
+++ /dev/null
@@ -1,187 +0,0 @@
---- src/polkit/polkit-sysdeps.c.orig	2007-11-28 16:26:14.000000000 -0500
-+++ src/polkit/polkit-sysdeps.c	2008-01-02 00:42:47.000000000 -0500
-@@ -39,7 +39,6 @@
- #include <grp.h>
- #include <unistd.h>
- #include <errno.h>
--#include <sys/inotify.h>
- #include <syslog.h>
- 
- #include "polkit-sysdeps.h"
-@@ -82,7 +81,11 @@ polkit_sysdeps_get_start_time_for_pid (p
-         start_time = 0;
-         contents = NULL;
- 
-+#ifdef __FreeBSD__
-+        filename = kit_strdup_printf ("/proc/%d/status", pid);
-+#else
-         filename = kit_strdup_printf ("/proc/%d/stat", pid);
-+#endif
-         if (filename == NULL) {
-                 errno = ENOMEM;
-                 goto out;
-@@ -93,6 +96,35 @@ polkit_sysdeps_get_start_time_for_pid (p
-                 goto out;
-         }
- 
-+#ifdef __FreeBSD__
-+        tokens = kit_strsplit (contents, ' ', &num_tokens);
-+        if (tokens == NULL)
-+                goto out;
-+        if (num_tokens < 8) {
-+                kit_strfreev (tokens);
-+                goto out;
-+        }
-+
-+        p = kit_strdup (tokens[7]);
-+        kit_strfreev (tokens);
-+
-+        tokens = kit_strsplit (p, ',', &num_tokens);
-+        if (tokens == NULL)
-+                goto out;
-+        if (num_tokens >= 1) {
-+                start_time = strtoll (tokens[0], &endp, 10);
-+                if (endp == tokens[0]) {
-+                        kit_strfreev (tokens);
-+                        goto out;
-+                }
-+        } else {
-+                kit_strfreev (tokens);
-+                goto out;
-+        }
-+
-+        kit_strfreev (tokens);
-+#else
-+
-         /* start time is the 19th token after the '(process name)' entry */
- 
-         p = strchr (contents, ')');
-@@ -118,6 +150,7 @@ polkit_sysdeps_get_start_time_for_pid (p
-         }
- 
-         kit_strfreev (tokens);
-+#endif
- 
- out:
-         kit_free (filename);
-@@ -153,7 +186,11 @@ polkit_sysdeps_get_exe_for_pid (pid_t pi
- 
-         ret = 0;
- 
-+#ifdef __FreeBSD__
-+        snprintf (proc_name, sizeof (proc_name), "/proc/%d/file", pid);
-+#else
-         snprintf (proc_name, sizeof (proc_name), "/proc/%d/exe", pid);
-+#endif
-         ret = readlink (proc_name, out_buf, buf_size - 1);
-         if (ret == -1) {
-                 strncpy (out_buf, "(unknown)", buf_size);
-@@ -166,6 +203,108 @@ out:
-         return ret;
- }
- 
-+#ifndef HAVE_GETLINE
-+/* Taken from GNU sed. */
-+/* Read up to (and including) a '\n' from STREAM into *LINEPTR
-+   (and null-terminate it). *LINEPTR is a pointer returned from malloc (or
-+   NULL), pointing to *N characters of space.  It is realloc'd as
-+   necessary.  Returns the number of characters read (not including the
-+   null terminator), or -1 on error or EOF.  */
-+
-+ssize_t
-+polkit_sysdeps_getline (char **lineptr, size_t *n, FILE *stream)
-+{
-+  char *line, *p;
-+  long size, copy;
-+
-+  if (lineptr == NULL || n == NULL) {
-+          errno = EINVAL;
-+          return (ssize_t) -1;
-+  }
-+
-+  if (ferror (stream))
-+          return (ssize_t) -1;
-+
-+  /* Make sure we have a line buffer to start with.  */
-+  if (*lineptr == NULL || *n < 2) /* !seen and no buf yet need 2 chars.  */ {
-+#ifndef        MAX_CANON
-+#define        MAX_CANON        256
-+#endif
-+          if (!*lineptr)
-+                  line = (char *) malloc (MAX_CANON);
-+          else
-+                  line = (char *) realloc (*lineptr, MAX_CANON);
-+          if (line == NULL)
-+                  return (ssize_t) -1;
-+          *lineptr = line;
-+          *n = MAX_CANON;
-+  }
-+
-+  line = *lineptr;
-+  size = *n;
-+
-+  copy = size;
-+  p = line;
-+
-+  while (1) {
-+          long len;
-+
-+          while (--copy > 0) {
-+                  int c = getc (stream);
-+
-+                  if (c == EOF)
-+                          goto lose;
-+                  else if ((*p++ = c) == '\n')
-+                          goto win;
-+          }
-+
-+          /* Need to enlarge the line buffer.  */
-+          len = p - line;
-+          size *= 2;
-+          line = (char *) realloc (line, size);
-+          if (line == NULL)
-+                  goto lose;
-+          *lineptr = line;
-+          *n = size;
-+          p = line + len;
-+          copy = size - len;
-+  }
-+
-+lose:
-+  if (p == *lineptr)
-+          return (ssize_t) -1;
-+
-+  /* Return a partial line since we got an error in the middle.  */
-+win:
-+  *p = '\0';
-+  return p - *lineptr;
-+}
-+#else
-+ssize_t
-+polkit_sysdeps_getline (char **lineptr, size_t *n, FILE *stream)
-+{
-+        return getline (lineptr, n, stream);
-+}
-+#endif
-+
-+#ifndef HAVE_CLEARENV
-+extern char **environ;
-+int
-+polkit_sysdeps_clearenv (void)
-+{
-+	if (environ != NULL) {
-+        	environ[0] = NULL;
-+	}
-+        return 0;
-+}
-+#else
-+int
-+polkit_sysdeps_clearenv (void)
-+{
-+        return clearenv ();
-+}
-+#endif
-+
- #ifdef POLKIT_BUILD_TESTS
- 
- static polkit_bool_t
diff --git a/sysutils/policykit/files/patch-src_polkit_polkit-sysdeps.h b/sysutils/policykit/files/patch-src_polkit_polkit-sysdeps.h
deleted file mode 100644
index da4be3497..000000000
--- a/sysutils/policykit/files/patch-src_polkit_polkit-sysdeps.h
+++ /dev/null
@@ -1,20 +0,0 @@
---- src/polkit/polkit-sysdeps.h.orig	2007-12-23 01:46:49.000000000 -0500
-+++ src/polkit/polkit-sysdeps.h	2007-12-23 01:48:22.000000000 -0500
-@@ -35,6 +35,7 @@
- #define POLKIT_SYSDEPS_H
- 
- #include <sys/types.h>
-+#include <stdio.h>
- #include <polkit/polkit-types.h>
- 
- POLKIT_BEGIN_DECLS
-@@ -43,6 +44,9 @@ polkit_uint64_t polkit_sysdeps_get_start
- 
- int polkit_sysdeps_get_exe_for_pid (pid_t pid, char *out_buf, size_t buf_size);
- 
-+ssize_t polkit_sysdeps_getline (char **lineptr, size_t *n, FILE *stream);
-+
-+int polkit_sysdeps_clearenv (void);
- 
- POLKIT_END_DECLS
- 
diff --git a/sysutils/policykit/files/patch-tools_polkit-auth.c b/sysutils/policykit/files/patch-tools_polkit-auth.c
deleted file mode 100644
index f3ee42d1f..000000000
--- a/sysutils/policykit/files/patch-tools_polkit-auth.c
+++ /dev/null
@@ -1,61 +0,0 @@
---- tools/polkit-auth.c.orig	2007-12-05 22:30:18.000000000 -0500
-+++ tools/polkit-auth.c	2007-12-23 01:43:36.000000000 -0500
-@@ -37,12 +37,13 @@
- #include <stdlib.h>
- #include <string.h>
- #include <sys/types.h>
-+#include <sys/wait.h>
- #include <pwd.h>
- #include <grp.h>
- #include <unistd.h>
- #include <errno.h>
- #include <termios.h>
- 
- #include <polkit-dbus/polkit-dbus.h>
- #include <polkit-grant/polkit-grant.h>
- 
-@@ -107,7 +109,7 @@ conversation_select_admin_user (PolKitGr
-         }
-         printf ("\n");
-         printf ("Select user: ");
--        getline (&lineptr, &linelen, stdin);
-+        polkit_sysdeps_getline (&lineptr, &linelen, stdin);
-         user = strdup (lineptr);
-         free (lineptr);
-         return user;
-@@ -133,7 +135,7 @@ conversation_pam_prompt_echo_off (PolKit
-                 exit (1);
-         }
- 
--        getline (&lineptr, &linelen, stdin);
-+        polkit_sysdeps_getline (&lineptr, &linelen, stdin);
-   
-         /* Restore terminal. */
-         tcsetattr (fileno (stdout), TCSAFLUSH, &old);
-@@ -151,7 +153,7 @@ conversation_pam_prompt_echo_on (PolKitG
-         size_t linelen = 0;
-         char *result;
-         printf ("%s", request);
--        getline (&lineptr, &linelen, stdin);
-+        polkit_sysdeps_getline (&lineptr, &linelen, stdin);
-         result = strdup (lineptr);
-         free (lineptr);
-         printf ("\n");
-@@ -189,7 +191,7 @@ conversation_override_grant_type (PolKit
-         case POLKIT_RESULT_ONLY_VIA_SELF_AUTH_KEEP_SESSION:
-                 printf ("Keep this privilege for the session? [no/session]?\n");
-         again:
--                getline (&lineptr, &linelen, stdin);
-+                polkit_sysdeps_getline (&lineptr, &linelen, stdin);
-                 if (g_str_has_prefix (lineptr, "no")) {
-                         ;
-                 } else if (g_str_has_prefix (lineptr, "session")) {
-@@ -204,7 +206,7 @@ conversation_override_grant_type (PolKit
-         case POLKIT_RESULT_ONLY_VIA_SELF_AUTH_KEEP_ALWAYS:
-                 printf ("Keep this privilege for the session or always? [no/session/always]?\n");
-         again2:
--                getline (&lineptr, &linelen, stdin);
-+                polkit_sysdeps_getline (&lineptr, &linelen, stdin);
-                 if (g_str_has_prefix (lineptr, "no")) {
-                         ;
-                 } else if (g_str_has_prefix (lineptr, "session")) {
diff --git a/sysutils/policykit/pkg-descr b/sysutils/policykit/pkg-descr
deleted file mode 100644
index 5c0023101..000000000
--- a/sysutils/policykit/pkg-descr
+++ /dev/null
@@ -1,4 +0,0 @@
-PolicyKit is a framework for defining policy for system-wide components and
-for desktop pieces to configure it. It is used by HAL.
-
-WWW: http://www.freedesktop.org/Software/hal
diff --git a/sysutils/policykit/pkg-install b/sysutils/policykit/pkg-install
deleted file mode 100644
index 3d49ff206..000000000
--- a/sysutils/policykit/pkg-install
+++ /dev/null
@@ -1,47 +0,0 @@
-#!/bin/sh
-
-case $2 in
-POST-INSTALL)
-	USER=polkit
-	GROUP=${USER}
-	UID=562
-	GID=${UID}
-	PW=/usr/sbin/pw
-
-	if ${PW} group show "${GROUP}" 2>/dev/null; then
-		echo "You already have a group \"${GROUP}\", so I will use it."
-	else
-		if ${PW} groupadd ${GROUP} -g ${GID}; then
-			echo "Added group \"${GROUP}\"."
-		else
-			echo "Adding group \"${GROUP}\" failed..."
-			exit 1
-		fi
-	fi
-
-	if ${PW} user show "${USER}" 2>/dev/null; then
-		echo "You already have a user \"${USER}\", so I will use it."
-	else
-		if ${PW} useradd ${USER} -u ${UID} -g ${GROUP} -h - \
-			-d "/nonexistent" -s /sbin/nologin -c "PolicyKit Daemon User"
-		then
-			echo "Added user \"${USER}\"."
-		else
-			echo "Adding user \"${USER}\" failed..."
-			exit 1
-		fi
-	fi
-
-	/usr/bin/install -d -o root -m 0770 -g ${GROUP} /var/run/PolicyKit
-	/usr/bin/install -d -o root -m 0770 -g ${GROUP} /var/lib/PolicyKit
-	/usr/bin/install -d -o root -m 0775 -g ${GROUP} /var/lib/PolicyKit-public
-	/bin/mkdir -p /var/lib/misc
-	/usr/bin/touch -f /var/lib/misc/PolicyKit.reload
-	/usr/bin/chgrp ${GROUP} /var/lib/misc/PolicyKit.reload
-	/bin/chmod 0775 /var/lib/misc/PolicyKit.reload
-	for i in ${PKG_PREFIX}/libexec/polkit-read-auth-helper ${PKG_PREFIX}/libexec/polkit-set-default-helper ${PKG_PREFIX}/libexec/polkit-grant-helper ${PKG_PREFIX}/libexec/polkit-grant-helper-pam ${PKG_PREFIX}/libexec/polkit-explicit-grant-helper ${PKG_PREFIX}/libexec/polkit-revoke-helper /var/lib/misc/PolicyKit.reload; do
-	    /usr/bin/chgrp ${GROUP} ${i}
-	done
-	exit 0
-	;;
-esac
diff --git a/sysutils/policykit/pkg-plist b/sysutils/policykit/pkg-plist
deleted file mode 100644
index 1442b6c2b..000000000
--- a/sysutils/policykit/pkg-plist
+++ /dev/null
@@ -1,71 +0,0 @@
-bin/polkit-action
-bin/polkit-auth
-bin/polkit-config-file-validate
-bin/polkit-policy-file-validate
-@unexec if cmp -s %D/etc/PolicyKit/PolicyKit.conf %D/etc/PolicyKit/PolicyKit.conf.dist; then rm -f %D/etc/PolicyKit/PolicyKit.conf
-etc/PolicyKit/PolicyKit.conf.dist
-@exec [ -f %B/PolicyKit.conf ] || cp %B/%f %B/PolicyKit.conf
-etc/PolicyKit/PolicyKit.conf
-etc/dbus-1/system.d/org.freedesktop.PolicyKit.conf
-etc/pam.d/polkit
-etc/profile.d/polkit-bash-completion.sh
-include/PolicyKit/polkit-dbus/polkit-dbus.h
-include/PolicyKit/polkit-dbus/polkit-simple.h
-include/PolicyKit/polkit-grant/polkit-grant.h
-include/PolicyKit/polkit/polkit-action.h
-include/PolicyKit/polkit/polkit-authorization-constraint.h
-include/PolicyKit/polkit/polkit-authorization-db.h
-include/PolicyKit/polkit/polkit-authorization.h
-include/PolicyKit/polkit/polkit-caller.h
-include/PolicyKit/polkit/polkit-config.h
-include/PolicyKit/polkit/polkit-context.h
-include/PolicyKit/polkit/polkit-error.h
-include/PolicyKit/polkit/polkit-policy-cache.h
-include/PolicyKit/polkit/polkit-policy-default.h
-include/PolicyKit/polkit/polkit-policy-file-entry.h
-include/PolicyKit/polkit/polkit-policy-file.h
-include/PolicyKit/polkit/polkit-result.h
-include/PolicyKit/polkit/polkit-seat.h
-include/PolicyKit/polkit/polkit-session.h
-include/PolicyKit/polkit/polkit-sysdeps.h
-include/PolicyKit/polkit/polkit-types.h
-include/PolicyKit/polkit/polkit.h
-lib/libpolkit-dbus.a
-lib/libpolkit-dbus.la
-lib/libpolkit-dbus.so
-lib/libpolkit-dbus.so.2
-lib/libpolkit-grant.a
-lib/libpolkit-grant.la
-lib/libpolkit-grant.so
-lib/libpolkit-grant.so.2
-lib/libpolkit.a
-lib/libpolkit.la
-lib/libpolkit.so
-lib/libpolkit.so.2
-libdata/pkgconfig/polkit-dbus.pc
-libdata/pkgconfig/polkit-grant.pc
-libdata/pkgconfig/polkit.pc
-libexec/polkit-explicit-grant-helper
-libexec/polkit-grant-helper
-libexec/polkit-grant-helper-pam
-libexec/polkit-read-auth-helper
-libexec/polkit-revoke-helper
-libexec/polkit-set-default-helper
-libexec/polkitd
-share/PolicyKit/config.dtd
-share/PolicyKit/policy/org.freedesktop.policykit.policy
-share/dbus-1/interfaces/org.freedesktop.PolicyKit.AuthenticationAgent.xml
-share/dbus-1/system-services/org.freedesktop.PolicyKit.service
-@dirrmtry share/PolicyKit/policy
-@dirrmtry share/PolicyKit
-@dirrm include/PolicyKit/polkit
-@dirrm include/PolicyKit/polkit-grant
-@dirrm include/PolicyKit/polkit-dbus
-@dirrm include/PolicyKit
-@dirrmtry etc/profile.d
-@dirrm etc/PolicyKit
-@unexec rm -rf /var/run/PolicyKit 2>/dev/null || true
-@unexec rmdir /var/lib/PolicyKit 2>/dev/null || true
-@unexec rmdir /var/lib/PolicyKit-public 2>/dev/null || true
-@unexec rm -f /var/lib/misc/PolicyKit.reload 2>/dev/null || true
-@unexec rmdir /var/lib/misc 2>/dev/null || true
diff --git a/sysutils/system-tools-backends/Makefile b/sysutils/system-tools-backends/Makefile
deleted file mode 100644
index 35890cb61..000000000
--- a/sysutils/system-tools-backends/Makefile
+++ /dev/null
@@ -1,40 +0,0 @@
-# New ports collection makefile for:	system-tools-backends
-# Date created:				11 February 2005
-# Whom:					Joe Marcus Clarke <marcus@FreeBSD.org>
-#
-# $FreeBSD$
-#   $MCom: ports/sysutils/system-tools-backends/Makefile,v 1.50 2008/03/05 18:25:57 mezz Exp $
-#
-
-PORTNAME=	system-tools-backends
-PORTVERSION=	2.6.0
-CATEGORIES=	sysutils gnome
-MASTER_SITES=	GNOME
-DIST_SUBDIR=	gnome2
-
-MAINTAINER=	gnome@FreeBSD.org
-COMMENT=	Backend system admin scripts for gnome-system-tools
-
-BUILD_DEPENDS=	${SITE_PERL}/${PERL_ARCH}/Net/DBus.pm:${PORTSDIR}/devel/p5-Net-DBus
-LIB_DEPENDS=	dbus-glib-1.2:${PORTSDIR}/devel/dbus-glib \
-		polkit-dbus.2:${PORTSDIR}/sysutils/policykit
-RUN_DEPENDS=	${SITE_PERL}/${PERL_ARCH}/Net/DBus.pm:${PORTSDIR}/devel/p5-Net-DBus
-
-USE_BZIP2=	yes
-USE_GMAKE=	yes
-USE_PERL5=	yes
-USE_GNOME=	gnomehack intlhack glib20
-GNU_CONFIGURE=	yes
-USE_GNOME_SUBR=	yes
-CONFIGURE_ARGS=	--with-stb-group=wheel \
-		--localstatedir=/var
-CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" \
-		LDFLAGS="-L${LOCALBASE}/lib"
-
-.include <bsd.port.pre.mk>
-
-.if ${PERL_LEVEL} <= 500800
-RUN_DEPENDS+=	${SITE_PERL}/File/Temp.pm:${PORTSDIR}/devel/p5-File-Temp
-.endif
-
-.include <bsd.port.post.mk>
diff --git a/sysutils/system-tools-backends/distinfo b/sysutils/system-tools-backends/distinfo
deleted file mode 100644
index 3e804006b..000000000
--- a/sysutils/system-tools-backends/distinfo
+++ /dev/null
@@ -1,3 +0,0 @@
-MD5 (gnome2/system-tools-backends-2.6.0.tar.bz2) = faf321012e92b72305878cd684547c54
-SHA256 (gnome2/system-tools-backends-2.6.0.tar.bz2) = 5c35820a7a3d7fc3af5c6e3ce7c7529359809e486fdafecb68601ac4d2bfa6f0
-SIZE (gnome2/system-tools-backends-2.6.0.tar.bz2) = 421806
diff --git a/sysutils/system-tools-backends/files/patch-Users_Users.pm b/sysutils/system-tools-backends/files/patch-Users_Users.pm
deleted file mode 100644
index 5e2598972..000000000
--- a/sysutils/system-tools-backends/files/patch-Users_Users.pm
+++ /dev/null
@@ -1,47 +0,0 @@
---- Users/Users.pm.orig	Thu Oct  5 09:27:21 2006
-+++ Users/Users.pm	Sun Apr 22 23:05:41 2007
-@@ -458,7 +458,7 @@
- 	
-   if ($Utils::Backend::tool{"system"} eq "FreeBSD")
-   {
--    $command = "$cmd_pw userdel -n \'" . $$user[$LOGIN] . "\' ";
-+    $command = "$cmd_pw userdel -n \'" . $$user[$LOGIN] . "\' -r ";
-   }
-   else
-   {
-@@ -538,10 +538,10 @@
-   {
-     my $pwdpipe;
-     my $home;
-+    my $user;
- 
--    # FreeBSD doesn't create the home directory
-     $home = $$user[$HOME];
--    &Utils::File::run ("$tool_mkdir -p $home");
-+    $user = $$user[$LOGIN];
- 
-     $command = "$cmd_pw useradd " .
-         " -n \'" . $$user[$LOGIN] . "\'" .
-@@ -549,11 +549,12 @@
-         " -d \'" . $$user[$HOME]  . "\'" .
-         " -g \'" . $$user[$GID]   . "\'" .
-         " -s \'" . $$user[$SHELL] . "\'" .
--        " -H 0"; # pw(8) reads password from STDIN
-+        " -m -h 0"; # pw(8) reads password from STDIN
- 
-     $pwdpipe = &Utils::File::run_pipe_write ($command);
-     print $pwdpipe $$user[$PASSWD];
-     &Utils::File::close_file ($pwdpipe);
-+    &Utils::File::run ("chown -R $user $home");
-   }
-   elsif ($Utils::Backend::tool{"system"} eq "SunOS")
-   {
-@@ -629,7 +630,7 @@
-         " -d \'" . $$new_user[$HOME]  . "\'" .
-         " -g \'" . $$new_user[$GID]   . "\'" .
-         " -s \'" . $$new_user[$SHELL] . "\'" .
--        " -H 0"; # pw(8) reads password from STDIN
-+        " -h 0"; # pw(8) reads password from STDIN
- 
-     $pwdpipe = &Utils::File::run_pipe_write ($command);
-     print $pwdpipe $$new_user[$PASSWD];
diff --git a/sysutils/system-tools-backends/files/patch-dispatcher_main.c b/sysutils/system-tools-backends/files/patch-dispatcher_main.c
deleted file mode 100644
index b575cbfd4..000000000
--- a/sysutils/system-tools-backends/files/patch-dispatcher_main.c
+++ /dev/null
@@ -1,11 +0,0 @@
---- dispatcher/main.c.orig	2007-10-29 20:36:16.890317344 -0400
-+++ dispatcher/main.c	2007-10-29 20:37:02.584773483 -0400
-@@ -47,7 +47,7 @@
- 
-   setsid ();
- 
--  if ((pidfile_fd = open (LOCALSTATEDIR "/run/system-tools-backends.pid", O_CREAT | O_WRONLY)) != -1)
-+  if ((pidfile_fd = open (LOCALSTATEDIR "/run/system-tools-backends.pid", O_CREAT | O_WRONLY, 0600)) != -1)
-     {
-       str = g_strdup_printf ("%d", getpid ());
-       write (pidfile_fd, str, strlen (str));
diff --git a/sysutils/system-tools-backends/pkg-descr b/sysutils/system-tools-backends/pkg-descr
deleted file mode 100644
index 3434030ae..000000000
--- a/sysutils/system-tools-backends/pkg-descr
+++ /dev/null
@@ -1,4 +0,0 @@
-System-tools-backends is a collection of scripts (mostly Perl) used by
-gnome-system-tools to perform system administration tasks.
-
-WWW: http://www.gnome.org/projects/gst/
diff --git a/sysutils/system-tools-backends/pkg-plist b/sysutils/system-tools-backends/pkg-plist
deleted file mode 100644
index c67960723..000000000
--- a/sysutils/system-tools-backends/pkg-plist
+++ /dev/null
@@ -1,62 +0,0 @@
-bin/system-tools-backends
-etc/dbus-1/system.d/system-tools-backends.conf
-libdata/pkgconfig/system-tools-backends-2.0.pc
-share/PolicyKit/policy/system-tools-backends.policy
-share/dbus-1/system-services/org.freedesktop.SystemToolsBackends.GroupsConfig.service
-share/dbus-1/system-services/org.freedesktop.SystemToolsBackends.HostsConfig.service
-share/dbus-1/system-services/org.freedesktop.SystemToolsBackends.IfacesConfig.service
-share/dbus-1/system-services/org.freedesktop.SystemToolsBackends.NFSConfig.service
-share/dbus-1/system-services/org.freedesktop.SystemToolsBackends.NTPConfig.service
-share/dbus-1/system-services/org.freedesktop.SystemToolsBackends.Platform.service
-share/dbus-1/system-services/org.freedesktop.SystemToolsBackends.SMBConfig.service
-share/dbus-1/system-services/org.freedesktop.SystemToolsBackends.ServicesConfig.service
-share/dbus-1/system-services/org.freedesktop.SystemToolsBackends.TimeConfig.service
-share/dbus-1/system-services/org.freedesktop.SystemToolsBackends.UserConfig.service
-share/dbus-1/system-services/org.freedesktop.SystemToolsBackends.UsersConfig.service
-share/dbus-1/system-services/org.freedesktop.SystemToolsBackends.service
-share/system-tools-backends-2.0/files/general_gprs_chatscript
-share/system-tools-backends-2.0/files/general_isdn_ppp_options
-share/system-tools-backends-2.0/files/general_pppoe_ppp_options
-share/system-tools-backends-2.0/scripts/GroupsConfig.pm
-share/system-tools-backends-2.0/scripts/HostsConfig.pm
-share/system-tools-backends-2.0/scripts/IfacesConfig.pm
-share/system-tools-backends-2.0/scripts/Init/Services.pm
-share/system-tools-backends-2.0/scripts/Init/ServicesList.pm
-share/system-tools-backends-2.0/scripts/NFSConfig.pm
-share/system-tools-backends-2.0/scripts/NTPConfig.pm
-share/system-tools-backends-2.0/scripts/Network/Hosts.pm
-share/system-tools-backends-2.0/scripts/Network/Ifaces.pm
-share/system-tools-backends-2.0/scripts/Platform.pm
-share/system-tools-backends-2.0/scripts/SMBConfig.pm
-share/system-tools-backends-2.0/scripts/ServicesConfig.pm
-share/system-tools-backends-2.0/scripts/Shares/NFS.pm
-share/system-tools-backends-2.0/scripts/Shares/SMB.pm
-share/system-tools-backends-2.0/scripts/StbObject.pm
-share/system-tools-backends-2.0/scripts/SystemToolsBackends.pl
-share/system-tools-backends-2.0/scripts/Time/NTP.pm
-share/system-tools-backends-2.0/scripts/Time/TimeDate.pm
-share/system-tools-backends-2.0/scripts/TimeConfig.pm
-share/system-tools-backends-2.0/scripts/UserConfig.pm
-share/system-tools-backends-2.0/scripts/Users/Groups.pm
-share/system-tools-backends-2.0/scripts/Users/Shells.pm
-share/system-tools-backends-2.0/scripts/Users/Users.pm
-share/system-tools-backends-2.0/scripts/UsersConfig.pm
-share/system-tools-backends-2.0/scripts/Utils/Backend.pm
-share/system-tools-backends-2.0/scripts/Utils/DBus.pm
-share/system-tools-backends-2.0/scripts/Utils/File.pm
-share/system-tools-backends-2.0/scripts/Utils/Monitor.pm
-share/system-tools-backends-2.0/scripts/Utils/Parse.pm
-share/system-tools-backends-2.0/scripts/Utils/Platform.pm
-share/system-tools-backends-2.0/scripts/Utils/Replace.pm
-share/system-tools-backends-2.0/scripts/Utils/Report.pm
-share/system-tools-backends-2.0/scripts/Utils/Util.pm
-share/system-tools-backends-2.0/scripts/Utils/XML.pm
-@dirrm share/system-tools-backends-2.0/scripts/Utils
-@dirrm share/system-tools-backends-2.0/scripts/Users
-@dirrm share/system-tools-backends-2.0/scripts/Time
-@dirrm share/system-tools-backends-2.0/scripts/Shares
-@dirrm share/system-tools-backends-2.0/scripts/Network
-@dirrm share/system-tools-backends-2.0/scripts/Init
-@dirrm share/system-tools-backends-2.0/scripts
-@dirrm share/system-tools-backends-2.0/files
-@dirrm share/system-tools-backends-2.0