summaryrefslogtreecommitdiffstats
path: root/sysutils
diff options
context:
space:
mode:
Diffstat (limited to 'sysutils')
-rw-r--r--sysutils/brasero/Makefile64
-rw-r--r--sysutils/brasero/distinfo3
-rw-r--r--sysutils/brasero/files/patch-libbrasero-media_scsi-cam.c27
-rw-r--r--sysutils/brasero/pkg-descr23
-rw-r--r--sysutils/brasero/pkg-plist502
-rw-r--r--sysutils/consolekit/Makefile41
-rw-r--r--sysutils/consolekit/distinfo3
-rw-r--r--sysutils/consolekit/files/ck-get-x11-display-device35
-rw-r--r--sysutils/consolekit/files/ck-get-x11-server-pid17
-rw-r--r--sysutils/consolekit/files/patch-src_ck-sysdeps-freebsd.c198
-rw-r--r--sysutils/consolekit/files/patch-src_ck-sysdeps-unix.c18
-rw-r--r--sysutils/consolekit/files/patch-src_main.c33
-rw-r--r--sysutils/consolekit/files/patch-src_test-vt-monitor.c33
-rw-r--r--sysutils/consolekit/files/patch-tools_Makefile.in77
-rw-r--r--sysutils/consolekit/files/patch-tools_ck-log-system-start.c60
-rw-r--r--sysutils/consolekit/pkg-descr6
-rw-r--r--sysutils/consolekit/pkg-plist42
-rw-r--r--sysutils/eiciel/Makefile33
-rw-r--r--sysutils/eiciel/distinfo3
-rw-r--r--sysutils/eiciel/pkg-descr5
-rw-r--r--sysutils/eiciel/pkg-message6
-rw-r--r--sysutils/eiciel/pkg-plist52
-rw-r--r--sysutils/gconf-editor/Makefile32
-rw-r--r--sysutils/gconf-editor/distinfo3
-rw-r--r--sysutils/gconf-editor/pkg-descr2
-rw-r--r--sysutils/gconf-editor/pkg-plist318
-rw-r--r--sysutils/gnome-control-center/Makefile66
-rw-r--r--sysutils/gnome-control-center/distinfo3
-rw-r--r--sysutils/gnome-control-center/files/patch-capplets_about-me_gnome-about-me-password.c15
-rw-r--r--sysutils/gnome-control-center/files/patch-capplets_common_gnome-theme-info.c11
-rw-r--r--sysutils/gnome-control-center/files/patch-configure10
-rw-r--r--sysutils/gnome-control-center/files/patch-libslab_directory-tile.c9
-rw-r--r--sysutils/gnome-control-center/pkg-descr3
-rw-r--r--sysutils/gnome-control-center/pkg-plist343
-rw-r--r--sysutils/gnome-power-manager/Makefile51
-rw-r--r--sysutils/gnome-power-manager/distinfo3
-rw-r--r--sysutils/gnome-power-manager/files/patch-libhal-glib_libhal-gdevice.c11
-rw-r--r--sysutils/gnome-power-manager/files/patch-src_Makefile.in29
-rw-r--r--sysutils/gnome-power-manager/files/patch-src_gpm-array-float.h14
-rw-r--r--sysutils/gnome-power-manager/files/patch-src_gpm-button.c37
-rw-r--r--sysutils/gnome-power-manager/files/patch-src_gpm-cell-array.c12
-rw-r--r--sysutils/gnome-power-manager/pkg-descr7
-rw-r--r--sysutils/gnome-power-manager/pkg-plist583
-rw-r--r--sysutils/gnome-settings-daemon/Makefile43
-rw-r--r--sysutils/gnome-settings-daemon/distinfo3
-rw-r--r--sysutils/gnome-settings-daemon/pkg-descr3
-rw-r--r--sysutils/gnome-settings-daemon/pkg-plist207
-rw-r--r--sysutils/gnome-system-monitor/Makefile35
-rw-r--r--sysutils/gnome-system-monitor/distinfo3
-rw-r--r--sysutils/gnome-system-monitor/files/patch-src_load-graph.cpp11
-rw-r--r--sysutils/gnome-system-monitor/files/patch-src_openfiles.cpp14
-rw-r--r--sysutils/gnome-system-monitor/pkg-descr1
-rw-r--r--sysutils/gnome-system-monitor/pkg-plist349
-rw-r--r--sysutils/gnome-system-tools/Makefile36
-rw-r--r--sysutils/gnome-system-tools/distinfo3
-rw-r--r--sysutils/gnome-system-tools/files/patch-src_users_user-settings.c15
-rw-r--r--sysutils/gnome-system-tools/pkg-descr10
-rw-r--r--sysutils/gnome-system-tools/pkg-plist573
-rw-r--r--sysutils/hal/Makefile123
-rw-r--r--sysutils/hal/distinfo3
-rw-r--r--sysutils/hal/files/10-mouse-sysmouse.fdi8
-rw-r--r--sysutils/hal/files/README.fuse31
-rw-r--r--sysutils/hal/files/extra-patch-tools_hal-storage-mount.c25
-rw-r--r--sysutils/hal/files/hald.in80
-rwxr-xr-xsysutils/hal/files/mount-fuse153
-rw-r--r--sysutils/hal/files/patch-Makefile.in25
-rw-r--r--sysutils/hal/files/patch-config.h.in12
-rw-r--r--sysutils/hal/files/patch-configure398
-rw-r--r--sysutils/hal/files/patch-configure.in64
-rw-r--r--sysutils/hal/files/patch-doc_Makefile.in11
-rw-r--r--sysutils/hal/files/patch-fdi_policy_10osvendor_10-power-mgmt-policy.fdi13
-rw-r--r--sysutils/hal/files/patch-fdi_policy_10osvendor_10-x11-input.fdi31
-rw-r--r--sysutils/hal/files/patch-hald_freebsd_Makefile.am14
-rw-r--r--sysutils/hal/files/patch-hald_freebsd_Makefile.in109
-rw-r--r--sysutils/hal/files/patch-hald_freebsd_addons_Makefile.in93
-rw-r--r--sysutils/hal/files/patch-hald_freebsd_addons_addon-mouse.c374
-rw-r--r--sysutils/hal/files/patch-hald_freebsd_addons_addon-storage.c371
-rw-r--r--sysutils/hal/files/patch-hald_freebsd_clock111
-rw-r--r--sysutils/hal/files/patch-hald_freebsd_hf-acpi.c90
-rw-r--r--sysutils/hal/files/patch-hald_freebsd_hf-computer.c26
-rw-r--r--sysutils/hal/files/patch-hald_freebsd_hf-devd.c56
-rw-r--r--sysutils/hal/files/patch-hald_freebsd_hf-devtree.c77
-rw-r--r--sysutils/hal/files/patch-hald_freebsd_hf-scsi.c11
-rw-r--r--sysutils/hal/files/patch-hald_freebsd_hf-storage.h13
-rw-r--r--sysutils/hal/files/patch-hald_freebsd_hf-usb.c178
-rw-r--r--sysutils/hal/files/patch-hald_freebsd_hf-usb.h10
-rw-r--r--sysutils/hal/files/patch-hald_freebsd_hf-usb2.c315
-rw-r--r--sysutils/hal/files/patch-hald_freebsd_hf-usb2.h40
-rw-r--r--sysutils/hal/files/patch-hald_freebsd_hf-volume.c105
-rw-r--r--sysutils/hal/files/patch-hald_freebsd_osspec.c32
-rw-r--r--sysutils/hal/files/patch-hald_freebsd_probing_Makefile.am57
-rw-r--r--sysutils/hal/files/patch-hald_freebsd_probing_Makefile.in170
-rw-r--r--sysutils/hal/files/patch-hald_freebsd_probing_probe-hiddev.c37
-rw-r--r--sysutils/hal/files/patch-hald_freebsd_probing_probe-mouse.c315
-rw-r--r--sysutils/hal/files/patch-hald_freebsd_probing_probe-storage.c39
-rw-r--r--sysutils/hal/files/patch-hald_freebsd_probing_probe-usb2-device.c211
-rw-r--r--sysutils/hal/files/patch-hald_freebsd_probing_probe-usb2-interface.c143
-rw-r--r--sysutils/hal/files/patch-hald_freebsd_probing_probe-volume.c74
-rw-r--r--sysutils/hal/files/patch-hald_hf-storage.c279
-rw-r--r--sysutils/hal/files/patch-tools_hal-storage-eject.c11
-rw-r--r--sysutils/hal/files/patch-tools_hal-storage-mount.c91
-rw-r--r--sysutils/hal/files/patch-tools_hal-storage-shared.c45
-rw-r--r--sysutils/hal/files/pkg-deinstall.in17
-rw-r--r--sysutils/hal/files/pkg-install.in25
-rw-r--r--sysutils/hal/pkg-descr6
-rw-r--r--sysutils/hal/pkg-plist134
-rw-r--r--sysutils/nautilus-cd-burner/Makefile56
-rw-r--r--sysutils/nautilus-cd-burner/distinfo3
-rw-r--r--sysutils/nautilus-cd-burner/pkg-descr2
-rw-r--r--sysutils/nautilus-cd-burner/pkg-message21
-rw-r--r--sysutils/nautilus-cd-burner/pkg-plist148
-rw-r--r--sysutils/pessulus/Makefile39
-rw-r--r--sysutils/pessulus/distinfo3
-rw-r--r--sysutils/pessulus/files/patch-data_Makefile.in11
-rw-r--r--sysutils/pessulus/pkg-descr6
-rw-r--r--sysutils/pessulus/pkg-plist174
-rw-r--r--sysutils/polkit-gnome/Makefile32
-rw-r--r--sysutils/polkit-gnome/distinfo3
-rw-r--r--sysutils/polkit-gnome/pkg-descr5
-rw-r--r--sysutils/polkit-gnome/pkg-plist66
-rw-r--r--sysutils/polkit/Makefile66
-rw-r--r--sysutils/polkit/distinfo3
-rw-r--r--sysutils/polkit/files/patch-data_Makefile.in11
-rw-r--r--sysutils/polkit/files/patch-src_polkitbackend_Makefile.in15
-rw-r--r--sysutils/polkit/pkg-descr4
-rw-r--r--sysutils/polkit/pkg-install12
-rw-r--r--sysutils/polkit/pkg-plist82
-rw-r--r--sysutils/system-tools-backends/Makefile38
-rw-r--r--sysutils/system-tools-backends/distinfo3
-rw-r--r--sysutils/system-tools-backends/files/patch-Users_Users.pm47
-rw-r--r--sysutils/system-tools-backends/files/patch-dispatcher_main.c11
-rw-r--r--sysutils/system-tools-backends/pkg-descr4
-rw-r--r--sysutils/system-tools-backends/pkg-plist132
-rw-r--r--sysutils/tracker-client/Makefile120
-rw-r--r--sysutils/tracker-client/distinfo3
-rw-r--r--sysutils/tracker-client/files/patch-src_libtracker-common_tracker-albumart.c12
-rw-r--r--sysutils/tracker-client/files/patch-src_libtracker-common_tracker-type-utils.c13
-rw-r--r--sysutils/tracker-client/files/patch-src_libtracker-gtk_Makefile.in19
-rw-r--r--sysutils/tracker-client/files/patch-src_libtracker-gtk_tracker-tag-bar.h11
-rw-r--r--sysutils/tracker-client/files/patch-src_tracker-applet_Makefile.in22
-rw-r--r--sysutils/tracker-client/files/patch-src_tracker-preferences_Makefile.in22
-rw-r--r--sysutils/tracker-client/files/patch-src_tracker-search-tool_Makefile.in24
-rw-r--r--sysutils/tracker-client/files/patch-src_tracker-search-tool_tracker-search-tool-support.h18
-rw-r--r--sysutils/tracker-client/pkg-descr13
-rw-r--r--sysutils/tracker-client/pkg-plist310
-rw-r--r--sysutils/tracker-gnome/Makefile16
-rw-r--r--sysutils/tracker-gnome/pkg-plist15
-rw-r--r--sysutils/tracker-libtrackergtk/Makefile17
-rw-r--r--sysutils/tracker-libtrackergtk/pkg-descr3
-rw-r--r--sysutils/tracker-libtrackergtk/pkg-plist14
-rw-r--r--sysutils/tracker/Makefile37
-rw-r--r--sysutils/tracker/pkg-descr13
152 files changed, 0 insertions, 10504 deletions
diff --git a/sysutils/brasero/Makefile b/sysutils/brasero/Makefile
deleted file mode 100644
index 1eb5ef5e0..000000000
--- a/sysutils/brasero/Makefile
+++ /dev/null
@@ -1,64 +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.58 2009/10/20 18:46:55 kwm Exp $
-
-PORTNAME= brasero
-PORTVERSION= 2.28.2
-PORTREVISION= 1
-CATEGORIES= sysutils audio multimedia gnome
-MASTER_SITES= GNOME
-DIST_SUBDIR= gnome2
-
-MAINTAINER= gnome@FreeBSD.org
-COMMENT= CD/DVD mastering tool for the GNOME desktop
-
-LIB_DEPENDS= notify.1:${PORTSDIR}/devel/libnotify \
- unique-1.0.2:${PORTSDIR}/x11-toolkits/unique \
- totem-plparser.12:${PORTSDIR}/multimedia/totem-pl-parser
-RUN_DEPENDS= growisofs:${PORTSDIR}/sysutils/dvd+rw-tools \
- cdrdao:${PORTSDIR}/sysutils/cdrdao
-
-USE_GETTEXT= yes
-USE_BZIP2= yes
-GNU_CONFIGURE= yes
-USE_GMAKE= yes
-USE_XORG= sm
-USE_GNOME= intlhack gnomeprefix gnomehack
-USE_LDCONFIG= yes
-USE_GSTREAMER= gconf core
-INSTALLS_OMF= yes
-INSTALLS_ICONS= yes
-CONFIGURE_ARGS= --disable-inotify --with-html-dir=${PREFIX}/share/doc
-CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include -DHAVE_CAM_LIB_H=1" \
- LDFLAGS="-L${LOCALBASE}/lib"
-
-MAN1= brasero.1
-GCONF_SCHEMAS= brasero.schemas
-
-OPTIONS= NAUTILUS "Enable Nautilus extension" on \
- LIBBURNIA "Enable libburnia plug-ins" off
-
-.include <bsd.port.pre.mk>
-
-.if !defined(WITHOUT_NAUTILUS)
-USE_GNOME+= nautilus2
-CONFIGURE_ARGS+=--enable-nautilus
-PLIST_SUB+= NAUTILUS=""
-.else
-PLIST_SUB+= NAUTILUS="@comment "
-CONFIGURE_ARGS+=--enable-nautilus=no
-.endif
-
-.if defined(WITH_LIBBURNIA)
-LIB_DEPENDS+= burn.4:${PORTSDIR}/devel/libburn \
- isofs.6:${PORTSDIR}/devel/libisofs
-CONFIGURE_ARGS+=--enable-libburnia
-PLIST_SUB+= LIBBURNIA=""
-.else
-PLIST_SUB+= LIBBURNIA="@comment "
-.endif
-
-.include <bsd.port.post.mk>
diff --git a/sysutils/brasero/distinfo b/sysutils/brasero/distinfo
deleted file mode 100644
index ad6a5f30b..000000000
--- a/sysutils/brasero/distinfo
+++ /dev/null
@@ -1,3 +0,0 @@
-MD5 (gnome2/brasero-2.28.2.tar.bz2) = 7a6ab4befeadbc2ad21bd1195a840097
-SHA256 (gnome2/brasero-2.28.2.tar.bz2) = 7c3493b1f4e90b4b9a4bcf155c1cd85142bb24a038cc5baa8defdad8526650df
-SIZE (gnome2/brasero-2.28.2.tar.bz2) = 4072165
diff --git a/sysutils/brasero/files/patch-libbrasero-media_scsi-cam.c b/sysutils/brasero/files/patch-libbrasero-media_scsi-cam.c
deleted file mode 100644
index e342112f8..000000000
--- a/sysutils/brasero/files/patch-libbrasero-media_scsi-cam.c
+++ /dev/null
@@ -1,27 +0,0 @@
---- libbrasero-media/scsi-cam.c.orig 2009-09-25 10:39:03.000000000 -0400
-+++ libbrasero-media/scsi-cam.c 2009-10-10 13:30:06.000000000 -0400
-@@ -184,6 +184,8 @@ brasero_device_handle_open (const gchar
- handle->fd = fd;
- }
- else {
-+ int serrno;
-+
- if (code) {
- if (errno == EAGAIN
- || errno == EWOULDBLOCK
-@@ -193,6 +195,15 @@ brasero_device_handle_open (const gchar
- *code = BRASERO_SCSI_ERRNO;
- }
-
-+ serrno = errno;
-+
-+ if (fd > -1)
-+ close (fd);
-+ if (cam)
-+ cam_close_device (cam);
-+
-+ errno = serrno;
-+
- return NULL;
- }
-
diff --git a/sysutils/brasero/pkg-descr b/sysutils/brasero/pkg-descr
deleted file mode 100644
index 38ff4ebc9..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://projects.gnome.org/brasero/
diff --git a/sysutils/brasero/pkg-plist b/sysutils/brasero/pkg-plist
deleted file mode 100644
index cef48951d..000000000
--- a/sysutils/brasero/pkg-plist
+++ /dev/null
@@ -1,502 +0,0 @@
-bin/brasero
-include/brasero/brasero-blank-dialog.h
-include/brasero/brasero-burn-dialog.h
-include/brasero/brasero-burn-lib.h
-include/brasero/brasero-burn-options.h
-include/brasero/brasero-burn.h
-include/brasero/brasero-drive-selection.h
-include/brasero/brasero-drive.h
-include/brasero/brasero-enums.h
-include/brasero/brasero-error.h
-include/brasero/brasero-media.h
-include/brasero/brasero-medium-monitor.h
-include/brasero/brasero-medium-selection.h
-include/brasero/brasero-medium.h
-include/brasero/brasero-session-cfg.h
-include/brasero/brasero-session-span.h
-include/brasero/brasero-session.h
-include/brasero/brasero-status.h
-include/brasero/brasero-sum-dialog.h
-include/brasero/brasero-tags.h
-include/brasero/brasero-tool-dialog.h
-include/brasero/brasero-track-data-cfg.h
-include/brasero/brasero-track-data.h
-include/brasero/brasero-track-disc.h
-include/brasero/brasero-track-image-cfg.h
-include/brasero/brasero-track-image.h
-include/brasero/brasero-track-stream-cfg.h
-include/brasero/brasero-track-stream.h
-include/brasero/brasero-track-type.h
-include/brasero/brasero-track.h
-include/brasero/brasero-units.h
-include/brasero/brasero-volume.h
-lib/brasero/plugins/libbrasero-burn-uri.la
-lib/brasero/plugins/libbrasero-burn-uri.so
-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-checksum-file.la
-lib/brasero/plugins/libbrasero-checksum-file.so
-lib/brasero/plugins/libbrasero-checksum.la
-lib/brasero/plugins/libbrasero-checksum.so
-lib/brasero/plugins/libbrasero-dvdauthor.la
-lib/brasero/plugins/libbrasero-dvdauthor.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
-%%LIBBURNIA%%lib/brasero/plugins/libbrasero-libburn.la
-%%LIBBURNIA%%lib/brasero/plugins/libbrasero-libburn.so
-%%LIBBURNIA%%lib/brasero/plugins/libbrasero-libisofs.la
-%%LIBBURNIA%%lib/brasero/plugins/libbrasero-libisofs.so
-lib/brasero/plugins/libbrasero-local-track.la
-lib/brasero/plugins/libbrasero-local-track.so
-lib/brasero/plugins/libbrasero-mkisofs.la
-lib/brasero/plugins/libbrasero-mkisofs.so
-lib/brasero/plugins/libbrasero-normalize.la
-lib/brasero/plugins/libbrasero-normalize.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-vcdimager.la
-lib/brasero/plugins/libbrasero-vcdimager.so
-lib/brasero/plugins/libbrasero-vob.la
-lib/brasero/plugins/libbrasero-vob.so
-lib/brasero/plugins/libbrasero-wodim.la
-lib/brasero/plugins/libbrasero-wodim.so
-lib/libbrasero-burn.la
-lib/libbrasero-burn.so
-lib/libbrasero-burn.so.2
-lib/libbrasero-media.la
-lib/libbrasero-media.so
-lib/libbrasero-media.so.2
-lib/libbrasero-utils.la
-lib/libbrasero-utils.so
-lib/libbrasero-utils.so.2
-%%NAUTILUS%%lib/nautilus/extensions-2.0/libnautilus-brasero-extension.la
-%%NAUTILUS%%lib/nautilus/extensions-2.0/libnautilus-brasero-extension.so
-libdata/pkgconfig/libbrasero-burn.pc
-libdata/pkgconfig/libbrasero-media.pc
-share/applications/brasero.desktop
-share/applications/brasero-copy-medium.desktop
-%%NAUTILUS%%share/applications/brasero-nautilus.desktop
-share/doc/libbrasero-burn/api-index-full.html
-share/doc/libbrasero-burn/ch01.html
-share/doc/libbrasero-burn/home.png
-share/doc/libbrasero-burn/index.html
-share/doc/libbrasero-burn/index.sgml
-share/doc/libbrasero-burn/left.png
-share/doc/libbrasero-burn/libbrasero-burn-BraseroBlankDialog.html
-share/doc/libbrasero-burn/libbrasero-burn-BraseroBurn.html
-share/doc/libbrasero-burn/libbrasero-burn-BraseroBurnDialog.html
-share/doc/libbrasero-burn/libbrasero-burn-BraseroBurnOptions.html
-share/doc/libbrasero-burn/libbrasero-burn-BraseroBurnSession.html
-share/doc/libbrasero-burn/libbrasero-burn-BraseroSessionCfg.html
-share/doc/libbrasero-burn/libbrasero-burn-BraseroSessionSpan.html
-share/doc/libbrasero-burn/libbrasero-burn-BraseroSumDialog.html
-share/doc/libbrasero-burn/libbrasero-burn-BraseroToolDialog.html
-share/doc/libbrasero-burn/libbrasero-burn-BraseroTrack.html
-share/doc/libbrasero-burn/libbrasero-burn-BraseroTrackData.html
-share/doc/libbrasero-burn/libbrasero-burn-BraseroTrackDataCfg.html
-share/doc/libbrasero-burn/libbrasero-burn-BraseroTrackDisc.html
-share/doc/libbrasero-burn/libbrasero-burn-BraseroTrackImage.html
-share/doc/libbrasero-burn/libbrasero-burn-BraseroTrackImageCfg.html
-share/doc/libbrasero-burn/libbrasero-burn-BraseroTrackStream.html
-share/doc/libbrasero-burn/libbrasero-burn-BraseroTrackStreamCfg.html
-share/doc/libbrasero-burn/libbrasero-burn-brasero-burn-lib.html
-share/doc/libbrasero-burn/libbrasero-burn-brasero-enums.html
-share/doc/libbrasero-burn/libbrasero-burn-brasero-error.html
-share/doc/libbrasero-burn/libbrasero-burn-brasero-status.html
-share/doc/libbrasero-burn/libbrasero-burn-brasero-tags.html
-share/doc/libbrasero-burn/libbrasero-burn-brasero-track-type.html
-share/doc/libbrasero-burn/libbrasero-burn.devhelp
-share/doc/libbrasero-burn/libbrasero-burn.devhelp2
-share/doc/libbrasero-burn/object-tree.html
-share/doc/libbrasero-burn/right.png
-share/doc/libbrasero-burn/style.css
-share/doc/libbrasero-burn/up.png
-share/doc/libbrasero-media/api-index-full.html
-share/doc/libbrasero-media/ch01.html
-share/doc/libbrasero-media/home.png
-share/doc/libbrasero-media/index.html
-share/doc/libbrasero-media/index.sgml
-share/doc/libbrasero-media/left.png
-share/doc/libbrasero-media/libbrasero-media-BraseroDrive.html
-share/doc/libbrasero-media/libbrasero-media-BraseroDriveSelection.html
-share/doc/libbrasero-media/libbrasero-media-BraseroMedium.html
-share/doc/libbrasero-media/libbrasero-media-BraseroMediumMonitor.html
-share/doc/libbrasero-media/libbrasero-media-BraseroMediumSelection.html
-share/doc/libbrasero-media/libbrasero-media-BraseroVolume.html
-share/doc/libbrasero-media/libbrasero-media-brasero-media.html
-share/doc/libbrasero-media/libbrasero-media-brasero-units.html
-share/doc/libbrasero-media/libbrasero-media.devhelp
-share/doc/libbrasero-media/libbrasero-media.devhelp2
-share/doc/libbrasero-media/object-tree.html
-share/doc/libbrasero-media/right.png
-share/doc/libbrasero-media/style.css
-share/doc/libbrasero-media/up.png
-%%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/media-optical-video-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/media-optical-video-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/media-optical-video-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/actions/media-optical-video-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/48x48/actions/media-optical-video-new.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/gnome/help/brasero/C/brasero.xml
-share/gnome/help/brasero/C/figures/brasero_main.png
-share/gnome/help/brasero/C/legal.xml
-share/gnome/help/brasero/ca/brasero.xml
-share/gnome/help/brasero/ca/figures/brasero_main.png
-share/gnome/help/brasero/cs/brasero.xml
-share/gnome/help/brasero/cs/figures/brasero_main.png
-share/gnome/help/brasero/de/brasero.xml
-share/gnome/help/brasero/de/figures/brasero_main.png
-share/gnome/help/brasero/el/brasero.xml
-share/gnome/help/brasero/el/figures/brasero_main.png
-share/gnome/help/brasero/en_GB/brasero.xml
-share/gnome/help/brasero/en_GB/figures/brasero_main.png
-share/gnome/help/brasero/es/brasero.xml
-share/gnome/help/brasero/es/figures/brasero_main.png
-share/gnome/help/brasero/fr/brasero.xml
-share/gnome/help/brasero/fr/figures/brasero_main.png
-share/gnome/help/brasero/it/brasero.xml
-share/gnome/help/brasero/it/figures/brasero_main.png
-share/gnome/help/brasero/pl/brasero.xml
-share/gnome/help/brasero/pl/figures/brasero_main.png
-share/gnome/help/brasero/ru/brasero.xml
-share/gnome/help/brasero/ru/figures/brasero_main.png
-share/gnome/help/brasero/sv/brasero.xml
-share/gnome/help/brasero/sv/figures/brasero_main.png
-share/gnome/help/brasero/zh_CN/brasero.xml
-share/gnome/help/brasero/zh_CN/figures/brasero_main.png
-share/gnome/help/brasero/zh_HK/brasero.xml
-share/gnome/help/brasero/zh_HK/figures/brasero_main.png
-share/gnome/help/brasero/zh_TW/brasero.xml
-share/gnome/help/brasero/zh_TW/figures/brasero_main.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/as/LC_MESSAGES/brasero.mo
-share/locale/ast/LC_MESSAGES/brasero.mo
-share/locale/be/LC_MESSAGES/brasero.mo
-share/locale/bg/LC_MESSAGES/brasero.mo
-share/locale/bn/LC_MESSAGES/brasero.mo
-share/locale/bn_IN/LC_MESSAGES/brasero.mo
-share/locale/br/LC_MESSAGES/brasero.mo
-share/locale/ca/LC_MESSAGES/brasero.mo
-share/locale/ca@valencia/LC_MESSAGES/brasero.mo
-share/locale/cs/LC_MESSAGES/brasero.mo
-share/locale/da/LC_MESSAGES/brasero.mo
-share/locale/de/LC_MESSAGES/brasero.mo
-share/locale/dz/LC_MESSAGES/brasero.mo
-share/locale/el/LC_MESSAGES/brasero.mo
-share/locale/en_GB/LC_MESSAGES/brasero.mo
-share/locale/es/LC_MESSAGES/brasero.mo
-share/locale/et/LC_MESSAGES/brasero.mo
-share/locale/eu/LC_MESSAGES/brasero.mo
-share/locale/fi/LC_MESSAGES/brasero.mo
-share/locale/fr/LC_MESSAGES/brasero.mo
-share/locale/ga/LC_MESSAGES/brasero.mo
-share/locale/gl/LC_MESSAGES/brasero.mo
-share/locale/gu/LC_MESSAGES/brasero.mo
-share/locale/he/LC_MESSAGES/brasero.mo
-share/locale/hi/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/kn/LC_MESSAGES/brasero.mo
-share/locale/ko/LC_MESSAGES/brasero.mo
-share/locale/ku/LC_MESSAGES/brasero.mo
-share/locale/lt/LC_MESSAGES/brasero.mo
-share/locale/lv/LC_MESSAGES/brasero.mo
-share/locale/mai/LC_MESSAGES/brasero.mo
-share/locale/mk/LC_MESSAGES/brasero.mo
-share/locale/ml/LC_MESSAGES/brasero.mo
-share/locale/mr/LC_MESSAGES/brasero.mo
-share/locale/nb/LC_MESSAGES/brasero.mo
-share/locale/nl/LC_MESSAGES/brasero.mo
-share/locale/oc/LC_MESSAGES/brasero.mo
-share/locale/or/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/ro/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@latin/LC_MESSAGES/brasero.mo
-share/locale/sv/LC_MESSAGES/brasero.mo
-share/locale/ta/LC_MESSAGES/brasero.mo
-share/locale/te/LC_MESSAGES/brasero.mo
-share/locale/th/LC_MESSAGES/brasero.mo
-share/locale/tr/LC_MESSAGES/brasero.mo
-share/locale/uk/LC_MESSAGES/brasero.mo
-share/locale/vi/LC_MESSAGES/brasero.mo
-share/locale/zh_CN/LC_MESSAGES/brasero.mo
-share/locale/zh_HK/LC_MESSAGES/brasero.mo
-share/locale/zh_TW/LC_MESSAGES/brasero.mo
-share/mime/packages/brasero.xml
-share/omf/brasero/brasero-C.omf
-share/omf/brasero/brasero-ca.omf
-share/omf/brasero/brasero-cs.omf
-share/omf/brasero/brasero-de.omf
-share/omf/brasero/brasero-el.omf
-share/omf/brasero/brasero-en_GB.omf
-share/omf/brasero/brasero-es.omf
-share/omf/brasero/brasero-fr.omf
-share/omf/brasero/brasero-it.omf
-share/omf/brasero/brasero-pl.omf
-share/omf/brasero/brasero-ru.omf
-share/omf/brasero/brasero-sv.omf
-share/omf/brasero/brasero-zh_CN.omf
-share/omf/brasero/brasero-zh_HK.omf
-share/omf/brasero/brasero-zh_TW.omf
-@dirrm share/omf/brasero
-@dirrm share/gnome/help/brasero/zh_TW/figures
-@dirrm share/gnome/help/brasero/zh_TW
-@dirrm share/gnome/help/brasero/zh_HK/figures
-@dirrm share/gnome/help/brasero/zh_HK
-@dirrm share/gnome/help/brasero/zh_CN/figures
-@dirrm share/gnome/help/brasero/zh_CN
-@dirrm share/gnome/help/brasero/sv/figures
-@dirrm share/gnome/help/brasero/sv
-@dirrm share/gnome/help/brasero/ru/figures
-@dirrm share/gnome/help/brasero/ru
-@dirrm share/gnome/help/brasero/pl/figures
-@dirrm share/gnome/help/brasero/pl
-@dirrm share/gnome/help/brasero/it/figures
-@dirrm share/gnome/help/brasero/it
-@dirrm share/gnome/help/brasero/fr/figures
-@dirrm share/gnome/help/brasero/fr
-@dirrm share/gnome/help/brasero/es/figures
-@dirrm share/gnome/help/brasero/es
-@dirrm share/gnome/help/brasero/en_GB/figures
-@dirrm share/gnome/help/brasero/en_GB
-@dirrm share/gnome/help/brasero/el/figures
-@dirrm share/gnome/help/brasero/el
-@dirrm share/gnome/help/brasero/de/figures
-@dirrm share/gnome/help/brasero/de
-@dirrm share/gnome/help/brasero/cs/figures
-@dirrm share/gnome/help/brasero/cs
-@dirrm share/gnome/help/brasero/ca/figures
-@dirrm share/gnome/help/brasero/ca
-@dirrm share/gnome/help/brasero/C/figures
-@dirrm share/gnome/help/brasero/C
-@dirrm share/gnome/help/brasero
-@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/48x48/actions
-@dirrm %%DATADIR%%/icons/hicolor/48x48
-@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%%
-@dirrm share/doc/libbrasero-media
-@dirrm share/doc/libbrasero-burn
-@dirrmtry share/applications
-@dirrm lib/brasero/plugins
-@dirrm lib/brasero
-@dirrm include/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/zh_HK/LC_MESSAGES
-@dirrmtry share/locale/zh_HK
-@dirrmtry share/locale/uk/LC_MESSAGES
-@dirrmtry share/locale/uk
-@dirrmtry share/locale/te/LC_MESSAGES
-@dirrmtry share/locale/te
-@dirrmtry share/locale/sr@latin/LC_MESSAGES
-@dirrmtry share/locale/sr@latin
-@dirrmtry share/locale/oc/LC_MESSAGES
-@dirrmtry share/locale/oc
-@dirrmtry share/locale/mr/LC_MESSAGES
-@dirrmtry share/locale/mr
-@dirrmtry share/locale/mai/LC_MESSAGES
-@dirrmtry share/locale/mai
-@dirrmtry share/locale/ku/LC_MESSAGES
-@dirrmtry share/locale/ku
-@dirrmtry share/locale/dz/LC_MESSAGES
-@dirrmtry share/locale/dz
-@dirrmtry share/locale/ca@valencia/LC_MESSAGES
-@dirrmtry share/locale/ca@valencia
-@dirrmtry share/locale/bn_IN/LC_MESSAGES
-@dirrmtry share/locale/bn_IN
-@dirrmtry share/locale/ast/LC_MESSAGES
-@dirrmtry share/locale/ast
diff --git a/sysutils/consolekit/Makefile b/sysutils/consolekit/Makefile
deleted file mode 100644
index d5de5d745..000000000
--- a/sysutils/consolekit/Makefile
+++ /dev/null
@@ -1,41 +0,0 @@
-# New ports collection makefile for: ConsoleKit
-# Date Created: 26 Aug 2006
-# Whom: Florent Thoumie <flz@FreeBSD.org>
-#
-# $FreeBSD$
-# $MCom: ports/sysutils/consolekit/Makefile,v 1.22 2009/09/26 05:44:11 marcus Exp $
-
-PORTNAME= consolekit
-PORTVERSION= 0.4.1
-PORTREVISION= 1
-CATEGORIES= sysutils gnome
-MASTER_SITES= http://www.freedesktop.org/software/ConsoleKit/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-gobject-1.0:${PORTSDIR}/sysutils/polkit
-
-WRKSRC= ${WRKDIR}/ConsoleKit-${PORTVERSION}
-USE_BZIP2= yes
-USE_XORG= x11
-USE_GNOME= gnomehack
-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
- ${TOUCH} /var/log/ConsoleKit/history
-
-.include <bsd.port.mk>
diff --git a/sysutils/consolekit/distinfo b/sysutils/consolekit/distinfo
deleted file mode 100644
index 0dbdd04a2..000000000
--- a/sysutils/consolekit/distinfo
+++ /dev/null
@@ -1,3 +0,0 @@
-MD5 (ConsoleKit-0.4.1.tar.bz2) = 48eda4483cc97841d5f88e8e003eb6d7
-SHA256 (ConsoleKit-0.4.1.tar.bz2) = f032adc6146d745034315054c5822a7a09f30e20a40d6e802221fa977354403e
-SIZE (ConsoleKit-0.4.1.tar.bz2) = 398080
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 d57649345..000000000
--- a/sysutils/consolekit/files/patch-src_ck-sysdeps-freebsd.c
+++ /dev/null
@@ -1,198 +0,0 @@
---- src/ck-sysdeps-freebsd.c.orig 2008-04-03 20:36:21.000000000 -0400
-+++ src/ck-sysdeps-freebsd.c 2009-04-18 18:04:39.000000000 -0400
-@@ -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;
- }
-
-@@ -233,24 +232,28 @@ ck_process_stat_free (CkProcessStat *sta
- GHashTable *
- ck_unix_pid_get_env_hash (pid_t pid)
- {
-- GHashTable *hash;
-+ GHashTable *hash = NULL;
- char **penv;
-+ char errbuf[_POSIX2_LINE_MAX];
- kvm_t *kd;
- struct kinfo_proc p;
- int i;
-
-- kd = kvm_openfiles (_PATH_DEVNULL, _PATH_DEVNULL, NULL, O_RDONLY, NULL);
-+ kd = kvm_openfiles (_PATH_DEVNULL, _PATH_DEVNULL, NULL, O_RDONLY, errbuf);
- if (kd == NULL) {
-+ g_warning ("kvm_openfiles failed: %s", errbuf);
- return NULL;
- }
-
- if (! get_kinfo_proc (pid, &p)) {
-- return NULL;
-+ g_warning ("get_kinfo_proc failed: %s", g_strerror (errno));
-+ goto fail;
- }
-
- penv = kvm_getenvv (kd, &p, 0);
- if (penv == NULL) {
-- return NULL;
-+ g_warning ("kvm_getenvv failed: %s", kvm_geterr (kd));
-+ goto fail;
- }
-
- hash = g_hash_table_new_full (g_str_hash,
-@@ -270,6 +273,7 @@ ck_unix_pid_get_env_hash (pid_t pid)
- }
- }
-
-+fail:
- kvm_close (kd);
-
- return hash;
-@@ -280,7 +284,7 @@ ck_unix_pid_get_env (pid_t pid,
- const char *var)
- {
- GHashTable *hash;
-- char *val;
-+ char *val = NULL;
-
- /*
- * Would probably be more efficient to just loop through the
-@@ -288,6 +292,8 @@ ck_unix_pid_get_env (pid_t pid,
- * table, but this works for now.
- */
- hash = ck_unix_pid_get_env_hash (pid);
-+ if (hash == NULL)
-+ return val;
- val = g_strdup (g_hash_table_lookup (hash, var));
- g_hash_table_destroy (hash);
-
-@@ -327,38 +333,38 @@ 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;
-- }
-+ g.gl_offs = 0;
-+ glob ("/dev/ttyv*", GLOB_DOOFFS | GLOB_NOSORT, NULL, &g);
-+ for (i = 0; i < g.gl_pathc && g.gl_pathv[i] != NULL; i++) {
-+ struct stat sb;
-+ char *cdev;
-
-- while ((t = getttyent ()) != NULL) {
-- if (t->ty_status & TTY_ON && strncmp (t->ty_name, "ttyv", 4) == 0)
-+ cdev = g.gl_pathv[i];
-+ if (stat (cdev, &sb) > -1 && S_ISCHR (sb.st_mode)) {
- 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 *
-@@ -369,7 +375,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;
- }
-@@ -379,6 +390,7 @@ ck_get_console_num_from_device (const ch
- guint *num)
- {
- guint n;
-+ char c;
- gboolean ret;
-
- n = 0;
-@@ -388,7 +400,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;
-@@ -408,6 +424,7 @@ ck_get_active_console_num (int consol
- gboolean ret;
- int res;
- int active;
-+ char ttyn;
-
- g_assert (console_fd != -1);
-
-@@ -420,7 +437,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/files/patch-tools_ck-log-system-start.c b/sysutils/consolekit/files/patch-tools_ck-log-system-start.c
deleted file mode 100644
index 0e125ef26..000000000
--- a/sysutils/consolekit/files/patch-tools_ck-log-system-start.c
+++ /dev/null
@@ -1,60 +0,0 @@
---- tools/ck-log-system-start.c.orig 2009-09-14 20:08:10.000000000 -0400
-+++ tools/ck-log-system-start.c 2009-09-26 01:35:37.000000000 -0400
-@@ -26,6 +26,9 @@
- #include <unistd.h>
- #include <errno.h>
- #include <fcntl.h>
-+#ifdef __FreeBSD__
-+#include <kenv.h>
-+#endif
- #include <sys/types.h>
- #include <sys/stat.h>
- #include <sys/utsname.h>
-@@ -41,7 +44,9 @@
-
- #define DEFAULT_LOG_FILENAME LOCALSTATEDIR "/log/ConsoleKit/history"
-
-+#ifdef __linux__
- #define LINUX_KERNEL_CMDLINE "/proc/cmdline"
-+#endif
-
- /* Adapted from auditd auditd-event.c */
- static gboolean
-@@ -162,6 +167,7 @@ write_log_for_event (CkLogEvent *event)
- static char *
- get_boot_arguments (void)
- {
-+#if defined(__linux__)
- char *contents;
- gboolean res;
-
-@@ -178,6 +184,29 @@ get_boot_arguments (void)
- }
-
- return contents;
-+#elif defined(__FreeBSD__)
-+ char kern_name[1024], root[1024], mopts[1024];
-+ char *options;
-+
-+ options = NULL;
-+ if (kenv(KENV_GET, "kernelname", kern_name, sizeof (kern_name)) == -1) {
-+ return options;
-+ }
-+
-+ if (kenv(KENV_GET, "vfs.root.mountfrom.options", mopts, sizeof (mopts)) == -1) {
-+ g_strlcpy (mopts, "ro", sizeof (mopts));
-+ }
-+
-+ if (kenv(KENV_GET, "vfs.root.mountfrom", root, sizeof (root)) == -1) {
-+ g_strlcpy (root, "/", sizeof (root));
-+ }
-+
-+ options = g_strdup_printf ("%s %s root=%s", mopts, kern_name, root);
-+
-+ return options;
-+#else
-+ return NULL;
-+#endif
- }
-
- int
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 52e05ed98..000000000
--- a/sysutils/consolekit/pkg-plist
+++ /dev/null
@@ -1,42 +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/dbus-1/interfaces/org.freedesktop.ConsoleKit.Manager.xml
-share/dbus-1/interfaces/org.freedesktop.ConsoleKit.Seat.xml
-share/dbus-1/interfaces/org.freedesktop.ConsoleKit.Session.xml
-share/dbus-1/system-services/org.freedesktop.ConsoleKit.service
-share/polkit-1/actions/org.freedesktop.consolekit.policy
-@exec mkdir -p %D/etc/ConsoleKit/run-session.d
-@exec mkdir -p %D/etc/ConsoleKit/run-seat.d
-@exec mkdir -p %D/lib/ConsoleKit/run-session.d
-@dirrm lib/ConsoleKit/scripts
-@dirrmtry lib/ConsoleKit/run-session.d
-@dirrmtry lib/ConsoleKit/run-seat.d
-@dirrmtry lib/ConsoleKit
-@dirrm include/ConsoleKit/ck-connector
-@dirrm include/ConsoleKit
-@dirrm etc/ConsoleKit/seats.d
-@dirrmtry etc/ConsoleKit/run-session.d
-@dirrmtry etc/ConsoleKit/run-seat.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 c31cc6b1a..000000000
--- a/sysutils/eiciel/Makefile
+++ /dev/null
@@ -1,33 +0,0 @@
-# New ports collection makefile for: eiciel
-# Date created: July 20, 2005
-# Whom: andreas@syndrom23.de
-#
-# $FreeBSD$
-#
-
-PORTNAME= eiciel
-PORTVERSION= 0.9.6.1
-PORTREVISION= 3
-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
-
-USE_BZIP2= yes
-USE_GNOME= gnomehack gnomeprefix intlhack nautilus2 libgnomeui
-USE_GETTEXT= yes
-USE_GMAKE= yes
-USE_AUTOTOOLS= libtool:22
-CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \
- LDFLAGS="-L${LOCALBASE}/lib"
-CONFIGURE_ARGS= --with-nautilus-extensions-dir=${PREFIX}/lib/nautilus/extensions-2.0
-
-MAN1= eiciel.1
-
-post-install:
- @${CAT} ${PKGMESSAGE}
-
-.include <bsd.port.mk>
diff --git a/sysutils/eiciel/distinfo b/sysutils/eiciel/distinfo
deleted file mode 100644
index 7b0bf609d..000000000
--- a/sysutils/eiciel/distinfo
+++ /dev/null
@@ -1,3 +0,0 @@
-MD5 (eiciel-0.9.6.1.tar.bz2) = 9c6231747d0f0a9a932e2fb11c94fa2e
-SHA256 (eiciel-0.9.6.1.tar.bz2) = d0f892a1f6acbf402ee4fe2a08ab8a0fc75db1d566fb531aa6a5287986a649bb
-SIZE (eiciel-0.9.6.1.tar.bz2) = 581808
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 15029e1b2..000000000
--- a/sysutils/eiciel/pkg-plist
+++ /dev/null
@@ -1,52 +0,0 @@
-bin/eiciel
-lib/nautilus/extensions-2.0/libeiciel-nautilus.a
-lib/nautilus/extensions-2.0/libeiciel-nautilus.la
-lib/nautilus/extensions-2.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 0b27a0d11..000000000
--- a/sysutils/gconf-editor/Makefile
+++ /dev/null
@@ -1,32 +0,0 @@
-# New ports collection makefile for: gconf-editor
-# Date created: 12 May 2002
-# Whom: Joe Marcus Clarke <marcus@FreeBSD.org>
-#
-# $FreeBSD$
-# $MCom: ports/sysutils/gconf-editor/Makefile,v 1.78 2009/08/24 15:28:29 kwm Exp $
-#
-
-PORTNAME= gconf-editor
-PORTVERSION= 2.28.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
-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 ee5f4ddc8..000000000
--- a/sysutils/gconf-editor/distinfo
+++ /dev/null
@@ -1,3 +0,0 @@
-MD5 (gnome2/gconf-editor-2.28.0.tar.bz2) = f3f19df4ce47ca27bf69d355f24ac5ba
-SHA256 (gnome2/gconf-editor-2.28.0.tar.bz2) = 35f5256f1a93e872586bb6b8c81f7ebfdd78ab3edcfa508f59f99f0f75a74839
-SIZE (gnome2/gconf-editor-2.28.0.tar.bz2) = 1405006
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 3ec7408b4..000000000
--- a/sysutils/gconf-editor/pkg-plist
+++ /dev/null
@@ -1,318 +0,0 @@
-bin/gconf-editor
-share/applications/gconf-editor.desktop
-%%DATADIR%%/icons/hicolor/16x16/status/type-boolean.png
-%%DATADIR%%/icons/hicolor/16x16/status/type-float.png
-%%DATADIR%%/icons/hicolor/16x16/status/type-integer.png
-%%DATADIR%%/icons/hicolor/16x16/status/type-list.png
-%%DATADIR%%/icons/hicolor/16x16/status/type-pair.png
-%%DATADIR%%/icons/hicolor/16x16/status/type-schema.png
-%%DATADIR%%/icons/hicolor/16x16/status/type-string.png
-%%DATADIR%%/icons/hicolor/16x16/status/type-undefined.png
-share/gnome/help/gconf-editor/C/figures/entry-blank.png
-share/gnome/help/gconf-editor/C/figures/entry-bool.png
-share/gnome/help/gconf-editor/C/figures/entry-list.png
-share/gnome/help/gconf-editor/C/figures/entry-number.png
-share/gnome/help/gconf-editor/C/figures/entry-schema.png
-share/gnome/help/gconf-editor/C/figures/entry-string.png
-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/ca/figures/entry-blank.png
-share/gnome/help/gconf-editor/ca/figures/entry-bool.png
-share/gnome/help/gconf-editor/ca/figures/entry-list.png
-share/gnome/help/gconf-editor/ca/figures/entry-number.png
-share/gnome/help/gconf-editor/ca/figures/entry-schema.png
-share/gnome/help/gconf-editor/ca/figures/entry-string.png
-share/gnome/help/gconf-editor/ca/figures/gconf_editor_anno_window.png
-share/gnome/help/gconf-editor/ca/gconf-editor.xml
-share/gnome/help/gconf-editor/cs/figures/entry-blank.png
-share/gnome/help/gconf-editor/cs/figures/entry-bool.png
-share/gnome/help/gconf-editor/cs/figures/entry-list.png
-share/gnome/help/gconf-editor/cs/figures/entry-number.png
-share/gnome/help/gconf-editor/cs/figures/entry-schema.png
-share/gnome/help/gconf-editor/cs/figures/entry-string.png
-share/gnome/help/gconf-editor/cs/figures/gconf_editor_anno_window.png
-share/gnome/help/gconf-editor/cs/gconf-editor.xml
-share/gnome/help/gconf-editor/de/figures/entry-blank.png
-share/gnome/help/gconf-editor/de/figures/entry-bool.png
-share/gnome/help/gconf-editor/de/figures/entry-list.png
-share/gnome/help/gconf-editor/de/figures/entry-number.png
-share/gnome/help/gconf-editor/de/figures/entry-schema.png
-share/gnome/help/gconf-editor/de/figures/entry-string.png
-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/el/figures/entry-blank.png
-share/gnome/help/gconf-editor/el/figures/entry-bool.png
-share/gnome/help/gconf-editor/el/figures/entry-list.png
-share/gnome/help/gconf-editor/el/figures/entry-number.png
-share/gnome/help/gconf-editor/el/figures/entry-schema.png
-share/gnome/help/gconf-editor/el/figures/entry-string.png
-share/gnome/help/gconf-editor/el/figures/gconf_editor_anno_window.png
-share/gnome/help/gconf-editor/el/gconf-editor.xml
-share/gnome/help/gconf-editor/en_GB/figures/entry-blank.png
-share/gnome/help/gconf-editor/en_GB/figures/entry-bool.png
-share/gnome/help/gconf-editor/en_GB/figures/entry-list.png
-share/gnome/help/gconf-editor/en_GB/figures/entry-number.png
-share/gnome/help/gconf-editor/en_GB/figures/entry-schema.png
-share/gnome/help/gconf-editor/en_GB/figures/entry-string.png
-share/gnome/help/gconf-editor/en_GB/figures/gconf_editor_anno_window.png
-share/gnome/help/gconf-editor/en_GB/gconf-editor.xml
-share/gnome/help/gconf-editor/es/figures/entry-blank.png
-share/gnome/help/gconf-editor/es/figures/entry-bool.png
-share/gnome/help/gconf-editor/es/figures/entry-list.png
-share/gnome/help/gconf-editor/es/figures/entry-number.png
-share/gnome/help/gconf-editor/es/figures/entry-schema.png
-share/gnome/help/gconf-editor/es/figures/entry-string.png
-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/entry-blank.png
-share/gnome/help/gconf-editor/fr/figures/entry-bool.png
-share/gnome/help/gconf-editor/fr/figures/entry-list.png
-share/gnome/help/gconf-editor/fr/figures/entry-number.png
-share/gnome/help/gconf-editor/fr/figures/entry-schema.png
-share/gnome/help/gconf-editor/fr/figures/entry-string.png
-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/entry-blank.png
-share/gnome/help/gconf-editor/it/figures/entry-bool.png
-share/gnome/help/gconf-editor/it/figures/entry-list.png
-share/gnome/help/gconf-editor/it/figures/entry-number.png
-share/gnome/help/gconf-editor/it/figures/entry-schema.png
-share/gnome/help/gconf-editor/it/figures/entry-string.png
-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/entry-blank.png
-share/gnome/help/gconf-editor/oc/figures/entry-bool.png
-share/gnome/help/gconf-editor/oc/figures/entry-list.png
-share/gnome/help/gconf-editor/oc/figures/entry-number.png
-share/gnome/help/gconf-editor/oc/figures/entry-schema.png
-share/gnome/help/gconf-editor/oc/figures/entry-string.png
-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/pt_BR/figures/entry-blank.png
-share/gnome/help/gconf-editor/pt_BR/figures/entry-bool.png
-share/gnome/help/gconf-editor/pt_BR/figures/entry-list.png
-share/gnome/help/gconf-editor/pt_BR/figures/entry-number.png
-share/gnome/help/gconf-editor/pt_BR/figures/entry-schema.png
-share/gnome/help/gconf-editor/pt_BR/figures/entry-string.png
-share/gnome/help/gconf-editor/pt_BR/figures/gconf_editor_anno_window.png
-share/gnome/help/gconf-editor/pt_BR/gconf-editor.xml
-share/gnome/help/gconf-editor/ru/figures/entry-blank.png
-share/gnome/help/gconf-editor/ru/figures/entry-bool.png
-share/gnome/help/gconf-editor/ru/figures/entry-list.png
-share/gnome/help/gconf-editor/ru/figures/entry-number.png
-share/gnome/help/gconf-editor/ru/figures/entry-schema.png
-share/gnome/help/gconf-editor/ru/figures/entry-string.png
-share/gnome/help/gconf-editor/ru/figures/gconf_editor_anno_window.png
-share/gnome/help/gconf-editor/ru/gconf-editor.xml
-share/gnome/help/gconf-editor/sv/figures/entry-blank.png
-share/gnome/help/gconf-editor/sv/figures/entry-bool.png
-share/gnome/help/gconf-editor/sv/figures/entry-list.png
-share/gnome/help/gconf-editor/sv/figures/entry-number.png
-share/gnome/help/gconf-editor/sv/figures/entry-schema.png
-share/gnome/help/gconf-editor/sv/figures/entry-string.png
-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/th/figures/entry-blank.png
-share/gnome/help/gconf-editor/th/figures/entry-bool.png
-share/gnome/help/gconf-editor/th/figures/entry-list.png
-share/gnome/help/gconf-editor/th/figures/entry-number.png
-share/gnome/help/gconf-editor/th/figures/entry-schema.png
-share/gnome/help/gconf-editor/th/figures/entry-string.png
-share/gnome/help/gconf-editor/th/figures/gconf_editor_anno_window.png
-share/gnome/help/gconf-editor/th/gconf-editor.xml
-share/gnome/help/gconf-editor/uk/figures/entry-blank.png
-share/gnome/help/gconf-editor/uk/figures/entry-bool.png
-share/gnome/help/gconf-editor/uk/figures/entry-list.png
-share/gnome/help/gconf-editor/uk/figures/entry-number.png
-share/gnome/help/gconf-editor/uk/figures/entry-schema.png
-share/gnome/help/gconf-editor/uk/figures/entry-string.png
-share/gnome/help/gconf-editor/uk/figures/gconf_editor_anno_window.png
-share/gnome/help/gconf-editor/uk/gconf-editor.xml
-share/gnome/help/gconf-editor/zh_CN/figures/entry-blank.png
-share/gnome/help/gconf-editor/zh_CN/figures/entry-bool.png
-share/gnome/help/gconf-editor/zh_CN/figures/entry-list.png
-share/gnome/help/gconf-editor/zh_CN/figures/entry-number.png
-share/gnome/help/gconf-editor/zh_CN/figures/entry-schema.png
-share/gnome/help/gconf-editor/zh_CN/figures/entry-string.png
-share/gnome/help/gconf-editor/zh_CN/figures/gconf_editor_anno_window.png
-share/gnome/help/gconf-editor/zh_CN/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/ast/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/ca@valencia/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/mai/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/ps/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@latin/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-ca.omf
-share/omf/gconf-editor/gconf-editor-cs.omf
-share/omf/gconf-editor/gconf-editor-de.omf
-share/omf/gconf-editor/gconf-editor-el.omf
-share/omf/gconf-editor/gconf-editor-en_GB.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-pt_BR.omf
-share/omf/gconf-editor/gconf-editor-ru.omf
-share/omf/gconf-editor/gconf-editor-sv.omf
-share/omf/gconf-editor/gconf-editor-th.omf
-share/omf/gconf-editor/gconf-editor-uk.omf
-share/omf/gconf-editor/gconf-editor-zh_CN.omf
-@dirrm share/omf/gconf-editor
-@dirrm share/gnome/help/gconf-editor/zh_CN/figures
-@dirrm share/gnome/help/gconf-editor/zh_CN
-@dirrm share/gnome/help/gconf-editor/uk/figures
-@dirrm share/gnome/help/gconf-editor/uk
-@dirrm share/gnome/help/gconf-editor/th/figures
-@dirrm share/gnome/help/gconf-editor/th
-@dirrm share/gnome/help/gconf-editor/sv/figures
-@dirrm share/gnome/help/gconf-editor/sv
-@dirrm share/gnome/help/gconf-editor/ru/figures
-@dirrm share/gnome/help/gconf-editor/ru
-@dirrm share/gnome/help/gconf-editor/pt_BR/figures
-@dirrm share/gnome/help/gconf-editor/pt_BR
-@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/en_GB/figures
-@dirrm share/gnome/help/gconf-editor/en_GB
-@dirrm share/gnome/help/gconf-editor/el/figures
-@dirrm share/gnome/help/gconf-editor/el
-@dirrm share/gnome/help/gconf-editor/de/figures
-@dirrm share/gnome/help/gconf-editor/de
-@dirrm share/gnome/help/gconf-editor/cs/figures
-@dirrm share/gnome/help/gconf-editor/cs
-@dirrm share/gnome/help/gconf-editor/ca/figures
-@dirrm share/gnome/help/gconf-editor/ca
-@dirrm share/gnome/help/gconf-editor/C/figures
-@dirrm share/gnome/help/gconf-editor/C
-@dirrm share/gnome/help/gconf-editor
-@dirrm %%DATADIR%%/icons/hicolor/16x16/status
-@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/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/sr@latin/LC_MESSAGES
-@dirrmtry share/locale/sr@latin
-@dirrmtry share/locale/si/LC_MESSAGES
-@dirrmtry share/locale/si
-@dirrmtry share/locale/rw/LC_MESSAGES
-@dirrmtry share/locale/rw
-@dirrmtry share/locale/ps/LC_MESSAGES
-@dirrmtry share/locale/ps
-@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/mai/LC_MESSAGES
-@dirrmtry share/locale/mai
-@dirrmtry share/locale/ku/LC_MESSAGES
-@dirrmtry share/locale/ku
-@dirrmtry share/locale/dz/LC_MESSAGES
-@dirrmtry share/locale/dz
-@dirrmtry share/locale/ca@valencia/LC_MESSAGES
-@dirrmtry share/locale/ca@valencia
-@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/ast/LC_MESSAGES
-@dirrmtry share/locale/ast
-@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 cb6c8803f..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.197 2009/09/21 15:16:24 avl Exp $
-#
-
-PORTNAME= gnome-control-center
-PORTVERSION= 2.28.1
-CATEGORIES= sysutils gnome
-MASTER_SITES= GNOME
-DIST_SUBDIR= gnome2
-
-MAINTAINER= gnome@FreeBSD.org
-COMMENT= Control center for GNOME 2 project
-
-LIB_DEPENDS= canberra-gtk.0:${PORTSDIR}/audio/libcanberra \
- unique-1.0.2:${PORTSDIR}/x11-toolkits/unique
-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_GMAKE= yes
-GNOME_DESKTOP_VERSION=2
-USE_GSTREAMER= good
-WANT_GNOME= yes
-USE_GNOME= gnomeprefix gnomehack intlhack metacity gnomemenus \
- desktopfileutils libgnomekbd gnomedesktop librsvg2
-USE_XORG= xscrnsaver
-GNU_CONFIGURE= yes
-INSTALLS_OMF= yes
-INSTALLS_ICONS= yes
-USE_LDCONFIG= yes
-CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \
- LDFLAGS="-L${LOCALBASE}/lib"
-
-GCONF_SCHEMAS= control-center.schemas fontilus.schemas \
- gnome-control-center.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 bbba4e0ca..000000000
--- a/sysutils/gnome-control-center/distinfo
+++ /dev/null
@@ -1,3 +0,0 @@
-MD5 (gnome2/gnome-control-center-2.28.1.tar.bz2) = a37a1b5ff4cfce45baef0cf31126d380
-SHA256 (gnome2/gnome-control-center-2.28.1.tar.bz2) = bd1d9a55f810266c38a283baf6a4e92002d35c9366529eb92b25710f3456bbf1
-SIZE (gnome2/gnome-control-center-2.28.1.tar.bz2) = 2287398
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 c9b378544..000000000
--- a/sysutils/gnome-control-center/files/patch-capplets_common_gnome-theme-info.c
+++ /dev/null
@@ -1,11 +0,0 @@
---- capplets/common/gnome-theme-info.c.orig 2009-05-03 20:30:56.000000000 +0200
-+++ capplets/common/gnome-theme-info.c 2009-07-19 12:54:25.000000000 +0200
-@@ -1876,7 +1876,7 @@ gnome_theme_init ()
- #ifdef XCURSOR_ICONDIR
- /* if there's a separate xcursors dir, add that as well */
- if (strcmp (XCURSOR_ICONDIR, top_theme_dir_string) &&
-- strcmp (XCURSOR_ICONDIR, "/usr/share/icons")) {
-+ strcmp (XCURSOR_ICONDIR, "%%LOCALBASE%%/lib/X11/icons")) {
- top_theme_dir = g_file_new_for_path (XCURSOR_ICONDIR);
- add_top_icon_theme_dir_monitor (top_theme_dir, 1, NULL);
- g_object_unref (top_theme_dir);
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 fba462829..000000000
--- a/sysutils/gnome-control-center/pkg-descr
+++ /dev/null
@@ -1,3 +0,0 @@
-Configuration tools tightly integrated within the GNOME 2 desktop.
-
-WWW: http://www.gnome.org
diff --git a/sysutils/gnome-control-center/pkg-plist b/sysutils/gnome-control-center/pkg-plist
deleted file mode 100644
index cd01f573b..000000000
--- a/sysutils/gnome-control-center/pkg-plist
+++ /dev/null
@@ -1,343 +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-properties
-bin/gnome-thumbnail-font
-bin/gnome-typing-monitor
-bin/gnome-window-properties
-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/libgnome-window-settings.a
-lib/libgnome-window-settings.la
-lib/libgnome-window-settings.so
-lib/libgnome-window-settings.so.1
-lib/window-manager-settings/libmetacity.a
-lib/window-manager-settings/libmetacity.la
-lib/window-manager-settings/libmetacity.so
-libdata/pkgconfig/gnome-default-applications.pc
-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-properties.desktop
-share/applications/gnome-settings-mouse.desktop
-share/applications/gnome-theme-installer.desktop
-share/applications/gnomecc.desktop
-share/applications/keybinding.desktop
-share/applications/keyboard.desktop
-share/applications/window-properties.desktop
-share/desktop-directories/gnomecc.directory
-%%DATADIR%%/default-apps/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
-%%DATADIR%%/pixmaps/gnome-about-me-lock-open.png
-%%DATADIR%%/pixmaps/gnome-about-me-lock.png
-%%DATADIR%%/pixmaps/gtk-theme-thumbnailing.png
-%%DATADIR%%/pixmaps/icon-theme-thumbnailing.png
-%%DATADIR%%/pixmaps/left-index-finger.svg
-%%DATADIR%%/pixmaps/left-little-finger.svg
-%%DATADIR%%/pixmaps/left-middle-finger.svg
-%%DATADIR%%/pixmaps/left-ring-finger.svg
-%%DATADIR%%/pixmaps/left-thumb.svg
-%%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/print_error.svg
-%%DATADIR%%/pixmaps/print_ok.svg
-%%DATADIR%%/pixmaps/right-index-finger.svg
-%%DATADIR%%/pixmaps/right-little-finger.svg
-%%DATADIR%%/pixmaps/right-middle-finger.svg
-%%DATADIR%%/pixmaps/right-ring-finger.svg
-%%DATADIR%%/pixmaps/right-thumb.svg
-%%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/window-theme-thumbnailing.png
-%%DATADIR%%/ui/appearance.ui
-%%DATADIR%%/ui/at-enable-dialog.ui
-%%DATADIR%%/ui/display-capplet.ui
-share/gnome-control-center/ui/gnome-about-me-dialog.ui
-share/gnome-control-center/ui/gnome-about-me-fingerprint.ui
-share/gnome-control-center/ui/gnome-about-me-password.ui
-%%DATADIR%%/ui/gnome-default-applications-properties.ui
-%%DATADIR%%/ui/gnome-keybinding-properties.ui
-share/gnome-control-center/ui/gnome-keyboard-properties-a11y-notifications.ui
-share/gnome-control-center/ui/gnome-keyboard-properties-dialog.ui
-share/gnome-control-center/ui/gnome-keyboard-properties-layout-chooser.ui
-share/gnome-control-center/ui/gnome-keyboard-properties-model-chooser.ui
-share/gnome-control-center/ui/gnome-keyboard-properties-options-dialog.ui
-share/gnome-control-center/ui/gnome-mouse-properties.ui
-%%DATADIR%%/ui/gnome-network-properties.ui
-%%DATADIR%%/ui/gnome-window-properties.ui
-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-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/ca@valencia/control-center.xml
-share/gnome/help/control-center/cs/control-center.xml
-share/gnome/help/control-center/de/control-center.xml
-share/gnome/help/control-center/el/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-properties.png
-share/icons/hicolor/16x16/apps/gnome-settings-default-applications.png
-share/icons/hicolor/22x22/apps/gnome-display-properties.png
-share/icons/hicolor/22x22/apps/gnome-network-properties.png
-share/icons/hicolor/22x22/apps/gnome-settings-default-applications.png
-share/icons/hicolor/24x24/apps/gnome-display-properties.png
-share/icons/hicolor/24x24/apps/gnome-network-properties.png
-share/icons/hicolor/24x24/apps/gnome-settings-default-applications.png
-share/icons/hicolor/32x32/apps/gnome-display-properties.png
-share/icons/hicolor/32x32/apps/gnome-network-properties.png
-share/icons/hicolor/32x32/apps/gnome-settings-default-applications.png
-share/icons/hicolor/48x48/apps/gnome-network-properties.png
-share/icons/hicolor/48x48/apps/gnome-settings-default-applications.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-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/ast/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/ca@valencia/LC_MESSAGES/gnome-control-center-2.0.mo
-share/locale/crh/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/mai/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@latin/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/uz/LC_MESSAGES/gnome-control-center-2.0.mo
-share/locale/uz@cyrillic/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-ca@valencia.omf
-share/omf/control-center/control-center-cs.omf
-share/omf/control-center/control-center-de.omf
-share/omf/control-center/control-center-el.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/el
-@dirrm share/gnome/help/control-center/de
-@dirrm share/gnome/help/control-center/cs
-@dirrm share/gnome/help/control-center/ca@valencia
-@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%%/ui
-@dirrm %%DATADIR%%/pixmaps
-@dirrm %%DATADIR%%/default-apps
-@dirrmtry share/desktop-directories
-@dirrmtry share/applications
-@dirrm lib/window-manager-settings
-@dirrm include/gnome-window-settings-2.0
-@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/uz@cyrillic/LC_MESSAGES
-@dirrmtry share/locale/uz@cyrillic
-@dirrmtry share/locale/te/LC_MESSAGES
-@dirrmtry share/locale/te
-@dirrmtry share/locale/sr@latin/LC_MESSAGES
-@dirrmtry share/locale/sr@latin
-@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/mai/LC_MESSAGES
-@dirrmtry share/locale/mai
-@dirrmtry share/locale/ku/LC_MESSAGES
-@dirrmtry share/locale/ku
-@dirrmtry share/locale/dz/LC_MESSAGES
-@dirrmtry share/locale/dz
-@dirrmtry share/locale/crh/LC_MESSAGES
-@dirrmtry share/locale/crh
-@dirrmtry share/locale/ca@valencia/LC_MESSAGES
-@dirrmtry share/locale/ca@valencia
-@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/ast/LC_MESSAGES
-@dirrmtry share/locale/ast
-@dirrmtry share/locale/as/LC_MESSAGES
-@dirrmtry share/locale/as
diff --git a/sysutils/gnome-power-manager/Makefile b/sysutils/gnome-power-manager/Makefile
deleted file mode 100644
index 97e49e378..000000000
--- a/sysutils/gnome-power-manager/Makefile
+++ /dev/null
@@ -1,51 +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-stable/sysutils/gnome-power-manager/Makefile,v 1.5 2009/04/19 06:23:37 marcus Exp $
-#
-
-PORTNAME= gnome-power-manager
-PORTVERSION= 2.24.4
-PORTREVISION= 6
-CATEGORIES= sysutils gnome
-MASTER_SITES= GNOME
-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 \
- execinfo:${PORTSDIR}/devel/libexecinfo \
- polkit-gnome.0:${PORTSDIR}/sysutils/policykit-gnome \
- unique-1.0.2:${PORTSDIR}/x11-toolkits/unique
-
-USE_GETTEXT= yes
-USE_BZIP2= yes
-USE_GMAKE= yes
-INSTALLS_OMF= yes
-INSTALLS_ICONS= yes
-USE_AUTOTOOLS= libtool:22
-USE_GSTREAMER= good
-USE_GNOME= gnomeprefix gnomehack intlhack libgnomeui libwnck \
- gnomedocutils gnomepanel
-CONFIGURE_ARGS= --with-doc-dir=${PREFIX}/share/doc \
- --disable-docbook-docs \
- --enable-policykit
-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 c3465ec86..000000000
--- a/sysutils/gnome-power-manager/distinfo
+++ /dev/null
@@ -1,3 +0,0 @@
-MD5 (gnome2/gnome-power-manager-2.24.4.tar.bz2) = bad8bba644d31f88d92a11d8880feada
-SHA256 (gnome2/gnome-power-manager-2.24.4.tar.bz2) = 00da3aa929c444a600f7e5ccabd7a20f9b43710562b951c69cbe68ea4db37ef1
-SIZE (gnome2/gnome-power-manager-2.24.4.tar.bz2) = 2997032
diff --git a/sysutils/gnome-power-manager/files/patch-libhal-glib_libhal-gdevice.c b/sysutils/gnome-power-manager/files/patch-libhal-glib_libhal-gdevice.c
deleted file mode 100644
index 6d98cece2..000000000
--- a/sysutils/gnome-power-manager/files/patch-libhal-glib_libhal-gdevice.c
+++ /dev/null
@@ -1,11 +0,0 @@
---- libhal-glib/libhal-gdevice.c.orig 2009-04-19 02:15:52.000000000 -0400
-+++ libhal-glib/libhal-gdevice.c 2009-04-19 02:16:09.000000000 -0400
-@@ -280,7 +280,7 @@ hal_gdevice_query_capability (HalGDevice
- return FALSE;
- }
- ret = dbus_g_proxy_call (proxy, "QueryCapability", error,
-- G_TYPE_STRING, device->priv->udi,
-+ G_TYPE_STRING, capability,
- G_TYPE_INVALID,
- G_TYPE_BOOLEAN, has_capability,
- G_TYPE_INVALID);
diff --git a/sysutils/gnome-power-manager/files/patch-src_Makefile.in b/sysutils/gnome-power-manager/files/patch-src_Makefile.in
deleted file mode 100644
index 8bbbfb172..000000000
--- a/sysutils/gnome-power-manager/files/patch-src_Makefile.in
+++ /dev/null
@@ -1,29 +0,0 @@
---- src/Makefile.in.orig 2008-09-29 17:30:53.000000000 -0400
-+++ src/Makefile.in 2008-09-29 17:35:03.000000000 -0400
-@@ -471,7 +471,7 @@ gnome_power_statistics_SOURCES = \
- $(NULL)
-
- gnome_power_statistics_LDADD = $(GLIB_LIBS) $(GNOME_LIBS) $(DBUS_LIBS) \
-- $(LOCAL_LIBDBUS_LIBS) $(LOCAL_LIBUNIQUE_LIBS) $(NULL) \
-+ $(LOCAL_LIBDBUS_LIBS) $(LOCAL_LIBUNIQUE_LIBS) -lexecinfo $(NULL) \
- $(am__append_1)
- gnome_power_preferences_SOURCES = \
- egg-debug.h \
-@@ -499,7 +499,7 @@ gnome_power_preferences_SOURCES = \
- gnome_power_preferences_LDADD = $(GLIB_LIBS) $(GNOME_LIBS) $(HAL_LIBS) \
- $(DBUS_LIBS) $(POLKIT_GNOME_LIBS) $(GPM_EXTRA_LIBS) \
- $(LOCAL_LIBHAL_LIBS) $(LOCAL_LIBDBUS_LIBS) \
-- $(LOCAL_LIBUNIQUE_LIBS) $(NULL) $(am__append_2)
-+ $(LOCAL_LIBUNIQUE_LIBS) -lexecinfo $(NULL) $(am__append_2)
- gnome_power_manager_SOURCES = \
- egg-color.c \
- egg-color.h \
-@@ -588,7 +588,7 @@ gnome_power_manager_SOURCES = \
- gnome_power_manager_LDADD = $(GLIB_LIBS) $(GSTREAMER_LIBS) \
- $(GNOME_LIBS) $(HAL_LIBS) $(POLKIT_LIBS) $(DBUS_LIBS) \
- $(XRANDR_LIBS) $(GPM_EXTRA_LIBS) $(LOCAL_LIBHAL_LIBS) \
-- $(LOCAL_LIBDBUS_LIBS) $(NULL) $(am__append_3)
-+ $(LOCAL_LIBDBUS_LIBS) -lexecinfo $(NULL) $(am__append_3)
- gnome_power_self_test_SOURCES = \
- egg-color.c \
- egg-color.h \
diff --git a/sysutils/gnome-power-manager/files/patch-src_gpm-array-float.h b/sysutils/gnome-power-manager/files/patch-src_gpm-array-float.h
deleted file mode 100644
index 8273665a5..000000000
--- a/sysutils/gnome-power-manager/files/patch-src_gpm-array-float.h
+++ /dev/null
@@ -1,14 +0,0 @@
---- src/gpm-array-float.h.orig 2009-03-18 19:35:24.000000000 -0400
-+++ src/gpm-array-float.h 2009-03-18 19:35:42.000000000 -0400
-@@ -49,9 +49,9 @@ gfloat gpm_array_float_get_average (G
- gboolean gpm_array_float_print (GArray *array);
- GArray *gpm_array_float_convolve (GArray *data,
- GArray *kernel);
--inline gfloat gpm_array_float_get (GArray *array,
-+gfloat gpm_array_float_get (GArray *array,
- guint i);
--inline void gpm_array_float_set (GArray *array,
-+void gpm_array_float_set (GArray *array,
- guint i,
- gfloat value);
-
diff --git a/sysutils/gnome-power-manager/files/patch-src_gpm-button.c b/sysutils/gnome-power-manager/files/patch-src_gpm-button.c
deleted file mode 100644
index 7960d9f22..000000000
--- a/sysutils/gnome-power-manager/files/patch-src_gpm-button.c
+++ /dev/null
@@ -1,37 +0,0 @@
---- src/gpm-button.c.orig 2009-04-19 02:17:58.000000000 -0400
-+++ src/gpm-button.c 2009-04-19 02:20:39.000000000 -0400
-@@ -494,6 +494,25 @@ hal_daemon_stop_cb (HalGManager *hal_man
- }
- }
-
-+/*
-+ * hal_daemon_new_device_cb
-+ **/
-+static void
-+hal_daemon_new_device_cb (HalGManager *hal_manager, const gchar *udi, GpmButton *button)
-+{
-+ gboolean is_button;
-+ HalGDevice *device;
-+
-+ device = hal_gdevice_new ();
-+ hal_gdevice_set_udi (device, udi);
-+ hal_gdevice_query_capability (device, "button", &is_button, NULL);
-+ if (is_button == TRUE) {
-+ egg_debug ("Watching %s", udi);
-+ watch_add_button (button, udi);
-+ }
-+ g_object_unref (device);
-+}
-+
- /**
- * gpm_button_init:
- * @button: This class instance
-@@ -543,6 +562,8 @@ gpm_button_init (GpmButton *button)
- G_CALLBACK (hal_daemon_start_cb), button);
- g_signal_connect (button->priv->hal_manager, "daemon-stop",
- G_CALLBACK (hal_daemon_stop_cb), button);
-+ g_signal_connect (button->priv->hal_manager, "device-added",
-+ G_CALLBACK (hal_daemon_new_device_cb), button);
-
- button->priv->hal_devicestore = hal_gdevicestore_new ();
-
diff --git a/sysutils/gnome-power-manager/files/patch-src_gpm-cell-array.c b/sysutils/gnome-power-manager/files/patch-src_gpm-cell-array.c
deleted file mode 100644
index ea8e92f03..000000000
--- a/sysutils/gnome-power-manager/files/patch-src_gpm-cell-array.c
+++ /dev/null
@@ -1,12 +0,0 @@
---- src/gpm-cell-aray.c.orig 2009-10-24 19:59:07.000000000 -0400
-+++ src/gpm-cell-array.c 2009-10-24 19:59:50.000000000 -0400
-@@ -355,7 +355,8 @@ gpm_cell_array_update (GpmCellArray *cel
- * get an with batteries which have a very small charge unit and consequently
- * a very high charge. Fixes bug #327471 */
- if (unit->kind == GPM_CELL_UNIT_KIND_PRIMARY &&
-- unit->charge_current > 0 && unit->charge_last_full > 0) {
-+ unit->charge_current > 0 && unit->charge_last_full > 0 &&
-+ unit->percentage > 1) {
- gfloat pc = 100.0f * ((gfloat)unit->charge_current /
- (gfloat)unit->charge_last_full);
- if (pc < 0.0f) {
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 9329befef..000000000
--- a/sysutils/gnome-power-manager/pkg-plist
+++ /dev/null
@@ -1,583 +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-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/ast/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/is/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@latin/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/te/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/te/LC_MESSAGES
-@dirrmtry share/locale/te
-@dirrmtry share/locale/sr@latin/LC_MESSAGES
-@dirrmtry share/locale/sr@latin
-@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/ast/LC_MESSAGES
-@dirrmtry share/locale/ast
-@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 1fa46fb8d..000000000
--- a/sysutils/gnome-settings-daemon/Makefile
+++ /dev/null
@@ -1,43 +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.52 2009/10/19 18:51:22 kwm Exp $
-#
-
-PORTNAME= gnome-settings-daemon
-PORTVERSION= 2.28.1
-PORTREVISION= 1
-CATEGORIES= sysutils gnome
-MASTER_SITES= GNOME
-DIST_SUBDIR= gnome2
-
-MAINTAINER= gnome@FreeBSD.org
-COMMENT= GNOME 2 settings daemon
-
-LIB_DEPENDS= pulse.0:${PORTSDIR}/audio/pulseaudio \
- canberra-gtk.0:${PORTSDIR}/audio/libcanberra \
- notify.1:${PORTSDIR}/devel/libnotify
-RUN_DEPENDS= xrdb:${PORTSDIR}/x11/xrdb
-
-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
-INSTALLS_ICONS= yes
-CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \
- LDFLAGS="-L${LOCALBASE}/lib"
-
-GCONF_SCHEMAS= apps_gnome_settings_daemon_housekeeping.schemas \
- apps_gnome_settings_daemon_keybindings.schemas \
- apps_gnome_settings_daemon_xrandr.schemas \
- desktop_gnome_font_rendering.schemas \
- desktop_gnome_keybindings.schemas \
- desktop_gnome_peripherals_touchpad.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 5cced3e10..000000000
--- a/sysutils/gnome-settings-daemon/distinfo
+++ /dev/null
@@ -1,3 +0,0 @@
-MD5 (gnome2/gnome-settings-daemon-2.28.1.tar.bz2) = cadb2e161846c4df76fec45679db1f50
-SHA256 (gnome2/gnome-settings-daemon-2.28.1.tar.bz2) = 1267ef7d4069189b6bd05b915586b5b323688a136d394e571d29991d59bbadb2
-SIZE (gnome2/gnome-settings-daemon-2.28.1.tar.bz2) = 1174173
diff --git a/sysutils/gnome-settings-daemon/pkg-descr b/sysutils/gnome-settings-daemon/pkg-descr
deleted file mode 100644
index 9ce205e84..000000000
--- a/sysutils/gnome-settings-daemon/pkg-descr
+++ /dev/null
@@ -1,3 +0,0 @@
-GNOME 2 settings daemon.
-
-WWW: http://www.gnome.org
diff --git a/sysutils/gnome-settings-daemon/pkg-plist b/sysutils/gnome-settings-daemon/pkg-plist
deleted file mode 100644
index 3407151e0..000000000
--- a/sysutils/gnome-settings-daemon/pkg-plist
+++ /dev/null
@@ -1,207 +0,0 @@
-etc/xdg/autostart/gnome-settings-daemon.desktop
-include/gnome-settings-daemon-2.0/gnome-settings-daemon/gnome-settings-client.h
-include/gnome-settings-daemon-2.0/gnome-settings-daemon/gnome-settings-plugin.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/font.gnome-settings-plugin
-lib/gnome-settings-daemon-2.0/housekeeping.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/libfont.a
-lib/gnome-settings-daemon-2.0/libfont.la
-lib/gnome-settings-daemon-2.0/libfont.so
-lib/gnome-settings-daemon-2.0/libhousekeeping.a
-lib/gnome-settings-daemon-2.0/libhousekeeping.la
-lib/gnome-settings-daemon-2.0/libhousekeeping.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/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/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
-libexec/gsd-locate-pointer
-share/dbus-1/services/org.gnome.SettingsDaemon.service
-share/gnome-control-center/keybindings/50-accessibility.xml
-%%DATADIR%%/acme.ui
-%%DATADIR%%/gsd-a11y-preferences-dialog.ui
-%%DATADIR%%/modmap-dialog.ui
-%%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/icons/hicolor/16x16/apps/gsd-xrandr.png
-share/icons/hicolor/22x22/apps/gsd-xrandr.png
-share/icons/hicolor/24x24/apps/gsd-xrandr.png
-share/icons/hicolor/32x32/apps/gsd-xrandr.png
-share/icons/hicolor/scalable/apps/gsd-xrandr.svg
-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/as/LC_MESSAGES/gnome-settings-daemon.mo
-share/locale/ast/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/ca@valencia/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/kn/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/mai/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@latin/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/sr@latin/LC_MESSAGES
-@dirrmtry share/locale/sr@latin
-@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/mai/LC_MESSAGES
-@dirrmtry share/locale/mai
-@dirrmtry share/locale/ku/LC_MESSAGES
-@dirrmtry share/locale/ku
-@dirrmtry share/locale/dz/LC_MESSAGES
-@dirrmtry share/locale/dz
-@dirrmtry share/locale/ca@valencia/LC_MESSAGES
-@dirrmtry share/locale/ca@valencia
-@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/ast/LC_MESSAGES
-@dirrmtry share/locale/ast
-@dirrmtry share/locale/as/LC_MESSAGES
-@dirrmtry share/locale/as
diff --git a/sysutils/gnome-system-monitor/Makefile b/sysutils/gnome-system-monitor/Makefile
deleted file mode 100644
index 16125fa92..000000000
--- a/sysutils/gnome-system-monitor/Makefile
+++ /dev/null
@@ -1,35 +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.136 2009/07/18 21:09:03 kwm Exp $
-#
-
-PORTNAME= gnome-system-monitor
-PORTVERSION= 2.28.0
-CATEGORIES= sysutils gnome
-MASTER_SITES= GNOME
-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
-INSTALLS_OMF= yes
-USE_GMAKE= yes
-USE_GNOME= gnomeprefix intlhack gnomehack libwnck gnomevfs2 gnomedocutils \
- librsvg2
-GNU_CONFIGURE= yes
-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 9c0250230..000000000
--- a/sysutils/gnome-system-monitor/distinfo
+++ /dev/null
@@ -1,3 +0,0 @@
-MD5 (gnome2/gnome-system-monitor-2.28.0.tar.bz2) = 341c8fda9b518729e04465705da62994
-SHA256 (gnome2/gnome-system-monitor-2.28.0.tar.bz2) = 638875c6041cd2b0ad7219fecd8fe86eb9d4c8b0662166a84d7659bd6a9db1d3
-SIZE (gnome2/gnome-system-monitor-2.28.0.tar.bz2) = 2388199
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 9b934be3d..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
-@@ -412,7 +412,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/files/patch-src_openfiles.cpp b/sysutils/gnome-system-monitor/files/patch-src_openfiles.cpp
deleted file mode 100644
index c00526174..000000000
--- a/sysutils/gnome-system-monitor/files/patch-src_openfiles.cpp
+++ /dev/null
@@ -1,14 +0,0 @@
---- src/openfiles.cpp.orig 2008-05-27 16:16:46.000000000 -0400
-+++ src/openfiles.cpp 2008-05-27 16:19:53.000000000 -0400
-@@ -66,7 +66,11 @@ friendlier_hostname(const char *addr_str
- goto failsafe;
-
- if (getnameinfo(res->ai_addr, res->ai_addrlen, hostname,
-+#ifdef NI_IDN
- sizeof hostname, service, sizeof service, NI_IDN))
-+#else
-+ sizeof hostname, service, sizeof service, 0))
-+#endif
- goto failsafe;
-
- if (res) freeaddrinfo(res);
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 701940d51..000000000
--- a/sysutils/gnome-system-monitor/pkg-plist
+++ /dev/null
@@ -1,349 +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/ar/figures/addColumn.png
-share/gnome/help/gnome-system-monitor/ar/figures/changePriority.png
-share/gnome/help/gnome-system-monitor/ar/figures/colorPanel.png
-share/gnome/help/gnome-system-monitor/ar/figures/columnContextMenu.png
-share/gnome/help/gnome-system-monitor/ar/figures/gnome-system-monitor_window.png
-share/gnome/help/gnome-system-monitor/ar/figures/memoryMaps.png
-share/gnome/help/gnome-system-monitor/ar/figures/moreInfo.png
-share/gnome/help/gnome-system-monitor/ar/figures/processListing.png
-share/gnome/help/gnome-system-monitor/ar/figures/sortButton.png
-share/gnome/help/gnome-system-monitor/ar/figures/sortMenu.png
-share/gnome/help/gnome-system-monitor/ar/figures/sortMenu2.png
-share/gnome/help/gnome-system-monitor/ar/figures/systemMonitor.png
-share/gnome/help/gnome-system-monitor/ar/figures/viewMenu.png
-share/gnome/help/gnome-system-monitor/ar/gnome-system-monitor.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/cs/figures/addColumn.png
-share/gnome/help/gnome-system-monitor/cs/figures/changePriority.png
-share/gnome/help/gnome-system-monitor/cs/figures/colorPanel.png
-share/gnome/help/gnome-system-monitor/cs/figures/columnContextMenu.png
-share/gnome/help/gnome-system-monitor/cs/figures/gnome-system-monitor_window.png
-share/gnome/help/gnome-system-monitor/cs/figures/memoryMaps.png
-share/gnome/help/gnome-system-monitor/cs/figures/moreInfo.png
-share/gnome/help/gnome-system-monitor/cs/figures/processListing.png
-share/gnome/help/gnome-system-monitor/cs/figures/sortButton.png
-share/gnome/help/gnome-system-monitor/cs/figures/sortMenu.png
-share/gnome/help/gnome-system-monitor/cs/figures/sortMenu2.png
-share/gnome/help/gnome-system-monitor/cs/figures/systemMonitor.png
-share/gnome/help/gnome-system-monitor/cs/figures/viewMenu.png
-share/gnome/help/gnome-system-monitor/cs/gnome-system-monitor.xml
-share/gnome/help/gnome-system-monitor/da/figures/addColumn.png
-share/gnome/help/gnome-system-monitor/da/figures/changePriority.png
-share/gnome/help/gnome-system-monitor/da/figures/colorPanel.png
-share/gnome/help/gnome-system-monitor/da/figures/columnContextMenu.png
-share/gnome/help/gnome-system-monitor/da/figures/gnome-system-monitor_window.png
-share/gnome/help/gnome-system-monitor/da/figures/memoryMaps.png
-share/gnome/help/gnome-system-monitor/da/figures/moreInfo.png
-share/gnome/help/gnome-system-monitor/da/figures/processListing.png
-share/gnome/help/gnome-system-monitor/da/figures/sortButton.png
-share/gnome/help/gnome-system-monitor/da/figures/sortMenu.png
-share/gnome/help/gnome-system-monitor/da/figures/sortMenu2.png
-share/gnome/help/gnome-system-monitor/da/figures/systemMonitor.png
-share/gnome/help/gnome-system-monitor/da/figures/viewMenu.png
-share/gnome/help/gnome-system-monitor/da/gnome-system-monitor.xml
-share/gnome/help/gnome-system-monitor/de/figures/addColumn.png
-share/gnome/help/gnome-system-monitor/de/figures/changePriority.png
-share/gnome/help/gnome-system-monitor/de/figures/colorPanel.png
-share/gnome/help/gnome-system-monitor/de/figures/columnContextMenu.png
-share/gnome/help/gnome-system-monitor/de/figures/gnome-system-monitor_window.png
-share/gnome/help/gnome-system-monitor/de/figures/memoryMaps.png
-share/gnome/help/gnome-system-monitor/de/figures/moreInfo.png
-share/gnome/help/gnome-system-monitor/de/figures/processListing.png
-share/gnome/help/gnome-system-monitor/de/figures/sortButton.png
-share/gnome/help/gnome-system-monitor/de/figures/sortMenu.png
-share/gnome/help/gnome-system-monitor/de/figures/sortMenu2.png
-share/gnome/help/gnome-system-monitor/de/figures/systemMonitor.png
-share/gnome/help/gnome-system-monitor/de/figures/viewMenu.png
-share/gnome/help/gnome-system-monitor/de/gnome-system-monitor.xml
-share/gnome/help/gnome-system-monitor/el/figures/addColumn.png
-share/gnome/help/gnome-system-monitor/el/figures/changePriority.png
-share/gnome/help/gnome-system-monitor/el/figures/colorPanel.png
-share/gnome/help/gnome-system-monitor/el/figures/columnContextMenu.png
-share/gnome/help/gnome-system-monitor/el/figures/gnome-system-monitor_window.png
-share/gnome/help/gnome-system-monitor/el/figures/memoryMaps.png
-share/gnome/help/gnome-system-monitor/el/figures/moreInfo.png
-share/gnome/help/gnome-system-monitor/el/figures/processListing.png
-share/gnome/help/gnome-system-monitor/el/figures/sortButton.png
-share/gnome/help/gnome-system-monitor/el/figures/sortMenu.png
-share/gnome/help/gnome-system-monitor/el/figures/sortMenu2.png
-share/gnome/help/gnome-system-monitor/el/figures/systemMonitor.png
-share/gnome/help/gnome-system-monitor/el/figures/viewMenu.png
-share/gnome/help/gnome-system-monitor/el/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/as/LC_MESSAGES/gnome-system-monitor.mo
-share/locale/ast/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/ca@valencia/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/mai/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/ps/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@latin/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-ar.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-cs.omf
-share/omf/gnome-system-monitor/gnome-system-monitor-da.omf
-share/omf/gnome-system-monitor/gnome-system-monitor-de.omf
-share/omf/gnome-system-monitor/gnome-system-monitor-el.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/el/figures
-@dirrm share/gnome/help/gnome-system-monitor/el
-@dirrm share/gnome/help/gnome-system-monitor/de/figures
-@dirrm share/gnome/help/gnome-system-monitor/de
-@dirrm share/gnome/help/gnome-system-monitor/da/figures
-@dirrm share/gnome/help/gnome-system-monitor/da
-@dirrm share/gnome/help/gnome-system-monitor/cs/figures
-@dirrm share/gnome/help/gnome-system-monitor/cs
-@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/ar/figures
-@dirrm share/gnome/help/gnome-system-monitor/ar
-@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/sr@latin/LC_MESSAGES
-@dirrmtry share/locale/sr@latin
-@dirrmtry share/locale/si/LC_MESSAGES
-@dirrmtry share/locale/si
-@dirrmtry share/locale/rw/LC_MESSAGES
-@dirrmtry share/locale/rw
-@dirrmtry share/locale/ps/LC_MESSAGES
-@dirrmtry share/locale/ps
-@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/mai/LC_MESSAGES
-@dirrmtry share/locale/mai
-@dirrmtry share/locale/ku/LC_MESSAGES
-@dirrmtry share/locale/ku
-@dirrmtry share/locale/dz/LC_MESSAGES
-@dirrmtry share/locale/dz
-@dirrmtry share/locale/ca@valencia/LC_MESSAGES
-@dirrmtry share/locale/ca@valencia
-@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/ast/LC_MESSAGES
-@dirrmtry share/locale/ast
-@dirrmtry share/locale/as/LC_MESSAGES
-@dirrmtry share/locale/as
diff --git a/sysutils/gnome-system-tools/Makefile b/sysutils/gnome-system-tools/Makefile
deleted file mode 100644
index bb22a2ac8..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.87 2009/09/21 17:18:47 kwm Exp $
-#
-
-PORTNAME= gnome-system-tools
-PORTVERSION= 2.28.1
-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 \
- polkit-gtk-1.0:${PORTSDIR}/sysutils/polkit-gnome
-
-USE_BZIP2= yes
-USE_GMAKE= yes
-INSTALLS_ICONS= yes
-USE_GETTEXT= yes
-USE_LDCONFIG= yes
-GNOME_DESKTOP_VERSION=2
-USE_GNOME= gnomehack gnomeprefix intlhack nautilus2
-USE_AUTOTOOLS= libtool:22
-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 bce517344..000000000
--- a/sysutils/gnome-system-tools/distinfo
+++ /dev/null
@@ -1,3 +0,0 @@
-MD5 (gnome2/gnome-system-tools-2.28.1.tar.bz2) = 1614c0727801a9cb124c773f8bd76291
-SHA256 (gnome2/gnome-system-tools-2.28.1.tar.bz2) = eebc44c570c3af4642ee29859ca8caa0b780e0545c42c2e2bf214ef322299d61
-SIZE (gnome2/gnome-system-tools-2.28.1.tar.bz2) = 5308059
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 69ba8c660..000000000
--- a/sysutils/gnome-system-tools/pkg-plist
+++ /dev/null
@@ -1,573 +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/cs/figures/network-tool.png
-share/gnome/help/network-admin/cs/network-admin.xml
-share/gnome/help/network-admin/de/figures/network-tool.png
-share/gnome/help/network-admin/de/network-admin.xml
-share/gnome/help/network-admin/el/figures/network-tool.png
-share/gnome/help/network-admin/el/network-admin.xml
-share/gnome/help/network-admin/en_GB/figures/network-tool.png
-share/gnome/help/network-admin/en_GB/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/it/figures/network-tool.png
-share/gnome/help/network-admin/it/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/network-admin/zh_CN/figures/network-tool.png
-share/gnome/help/network-admin/zh_CN/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/cs/figures/services-tool.png
-share/gnome/help/services-admin/cs/services-admin.xml
-share/gnome/help/services-admin/de/figures/services-tool.png
-share/gnome/help/services-admin/de/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/en_GB/figures/services-tool.png
-share/gnome/help/services-admin/en_GB/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/it/figures/services-tool.png
-share/gnome/help/services-admin/it/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/pl/figures/services-tool.png
-share/gnome/help/services-admin/pl/services-admin.xml
-share/gnome/help/services-admin/pt_BR/figures/services-tool.png
-share/gnome/help/services-admin/pt_BR/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/services-admin/zh_CN/figures/services-tool.png
-share/gnome/help/services-admin/zh_CN/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/cs/figures/shares-tool.png
-share/gnome/help/shares-admin/cs/shares-admin.xml
-share/gnome/help/shares-admin/de/figures/shares-tool.png
-share/gnome/help/shares-admin/de/shares-admin.xml
-share/gnome/help/shares-admin/el/figures/shares-tool.png
-share/gnome/help/shares-admin/el/shares-admin.xml
-share/gnome/help/shares-admin/en_GB/figures/shares-tool.png
-share/gnome/help/shares-admin/en_GB/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/it/figures/shares-tool.png
-share/gnome/help/shares-admin/it/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/pt_BR/figures/shares-tool.png
-share/gnome/help/shares-admin/pt_BR/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/shares-admin/zh_CN/figures/shares-tool.png
-share/gnome/help/shares-admin/zh_CN/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/cs/figures/time-map.png
-share/gnome/help/time-admin/cs/figures/time-servers.png
-share/gnome/help/time-admin/cs/figures/time-tool-automatic.png
-share/gnome/help/time-admin/cs/figures/time-tool-manual.png
-share/gnome/help/time-admin/cs/time-admin.xml
-share/gnome/help/time-admin/de/figures/time-map.png
-share/gnome/help/time-admin/de/figures/time-servers.png
-share/gnome/help/time-admin/de/figures/time-tool-automatic.png
-share/gnome/help/time-admin/de/figures/time-tool-manual.png
-share/gnome/help/time-admin/de/time-admin.xml
-share/gnome/help/time-admin/el/figures/time-map.png
-share/gnome/help/time-admin/el/figures/time-servers.png
-share/gnome/help/time-admin/el/figures/time-tool-automatic.png
-share/gnome/help/time-admin/el/figures/time-tool-manual.png
-share/gnome/help/time-admin/el/time-admin.xml
-share/gnome/help/time-admin/en_GB/figures/time-map.png
-share/gnome/help/time-admin/en_GB/figures/time-servers.png
-share/gnome/help/time-admin/en_GB/figures/time-tool-automatic.png
-share/gnome/help/time-admin/en_GB/figures/time-tool-manual.png
-share/gnome/help/time-admin/en_GB/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/it/figures/time-map.png
-share/gnome/help/time-admin/it/figures/time-servers.png
-share/gnome/help/time-admin/it/figures/time-tool-automatic.png
-share/gnome/help/time-admin/it/figures/time-tool-manual.png
-share/gnome/help/time-admin/it/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/pt_BR/figures/time-map.png
-share/gnome/help/time-admin/pt_BR/figures/time-servers.png
-share/gnome/help/time-admin/pt_BR/figures/time-tool-automatic.png
-share/gnome/help/time-admin/pt_BR/figures/time-tool-manual.png
-share/gnome/help/time-admin/pt_BR/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/time-admin/zh_CN/figures/time-map.png
-share/gnome/help/time-admin/zh_CN/figures/time-servers.png
-share/gnome/help/time-admin/zh_CN/figures/time-tool-automatic.png
-share/gnome/help/time-admin/zh_CN/figures/time-tool-manual.png
-share/gnome/help/time-admin/zh_CN/time-admin.xml
-share/gnome/help/users-admin/C/figures/groups.png
-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/groups.png
-share/gnome/help/users-admin/ca/figures/users-tool.png
-share/gnome/help/users-admin/ca/users-admin.xml
-share/gnome/help/users-admin/cs/figures/groups.png
-share/gnome/help/users-admin/cs/figures/users-tool.png
-share/gnome/help/users-admin/cs/users-admin.xml
-share/gnome/help/users-admin/de/figures/groups.png
-share/gnome/help/users-admin/de/figures/users-tool.png
-share/gnome/help/users-admin/de/users-admin.xml
-share/gnome/help/users-admin/el/figures/groups.png
-share/gnome/help/users-admin/el/figures/users-tool.png
-share/gnome/help/users-admin/el/users-admin.xml
-share/gnome/help/users-admin/en_GB/figures/groups.png
-share/gnome/help/users-admin/en_GB/figures/users-tool.png
-share/gnome/help/users-admin/en_GB/users-admin.xml
-share/gnome/help/users-admin/es/figures/groups.png
-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/groups.png
-share/gnome/help/users-admin/fr/figures/users-tool.png
-share/gnome/help/users-admin/fr/users-admin.xml
-share/gnome/help/users-admin/it/figures/groups.png
-share/gnome/help/users-admin/it/figures/users-tool.png
-share/gnome/help/users-admin/it/users-admin.xml
-share/gnome/help/users-admin/oc/figures/groups.png
-share/gnome/help/users-admin/oc/figures/users-tool.png
-share/gnome/help/users-admin/oc/users-admin.xml
-share/gnome/help/users-admin/pt_BR/figures/groups.png
-share/gnome/help/users-admin/pt_BR/figures/users-tool.png
-share/gnome/help/users-admin/pt_BR/users-admin.xml
-share/gnome/help/users-admin/ru/figures/groups.png
-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/groups.png
-share/gnome/help/users-admin/sv/figures/users-tool.png
-share/gnome/help/users-admin/sv/users-admin.xml
-share/gnome/help/users-admin/zh_CN/figures/groups.png
-share/gnome/help/users-admin/zh_CN/figures/users-tool.png
-share/gnome/help/users-admin/zh_CN/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/as/LC_MESSAGES/gnome-system-tools.mo
-share/locale/ast/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/ca@valencia/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/is/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/kn/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/mai/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/ps/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@latin/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/te/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-cs.omf
-share/omf/network-admin/network-admin-de.omf
-share/omf/network-admin/network-admin-el.omf
-share/omf/network-admin/network-admin-en_GB.omf
-share/omf/network-admin/network-admin-es.omf
-share/omf/network-admin/network-admin-fr.omf
-share/omf/network-admin/network-admin-it.omf
-share/omf/network-admin/network-admin-oc.omf
-share/omf/network-admin/network-admin-sv.omf
-share/omf/network-admin/network-admin-zh_CN.omf
-share/omf/services-admin/services-admin-C.omf
-share/omf/services-admin/services-admin-ca.omf
-share/omf/services-admin/services-admin-cs.omf
-share/omf/services-admin/services-admin-de.omf
-share/omf/services-admin/services-admin-el.omf
-share/omf/services-admin/services-admin-en_GB.omf
-share/omf/services-admin/services-admin-es.omf
-share/omf/services-admin/services-admin-fr.omf
-share/omf/services-admin/services-admin-it.omf
-share/omf/services-admin/services-admin-oc.omf
-share/omf/services-admin/services-admin-pl.omf
-share/omf/services-admin/services-admin-pt_BR.omf
-share/omf/services-admin/services-admin-sv.omf
-share/omf/services-admin/services-admin-zh_CN.omf
-share/omf/shares-admin/shares-admin-C.omf
-share/omf/shares-admin/shares-admin-ca.omf
-share/omf/shares-admin/shares-admin-cs.omf
-share/omf/shares-admin/shares-admin-de.omf
-share/omf/shares-admin/shares-admin-el.omf
-share/omf/shares-admin/shares-admin-en_GB.omf
-share/omf/shares-admin/shares-admin-es.omf
-share/omf/shares-admin/shares-admin-fr.omf
-share/omf/shares-admin/shares-admin-it.omf
-share/omf/shares-admin/shares-admin-oc.omf
-share/omf/shares-admin/shares-admin-pt_BR.omf
-share/omf/shares-admin/shares-admin-sv.omf
-share/omf/shares-admin/shares-admin-zh_CN.omf
-share/omf/time-admin/time-admin-C.omf
-share/omf/time-admin/time-admin-ca.omf
-share/omf/time-admin/time-admin-cs.omf
-share/omf/time-admin/time-admin-de.omf
-share/omf/time-admin/time-admin-el.omf
-share/omf/time-admin/time-admin-en_GB.omf
-share/omf/time-admin/time-admin-es.omf
-share/omf/time-admin/time-admin-fr.omf
-share/omf/time-admin/time-admin-it.omf
-share/omf/time-admin/time-admin-oc.omf
-share/omf/time-admin/time-admin-pt_BR.omf
-share/omf/time-admin/time-admin-ru.omf
-share/omf/time-admin/time-admin-sv.omf
-share/omf/time-admin/time-admin-zh_CN.omf
-share/omf/users-admin/users-admin-C.omf
-share/omf/users-admin/users-admin-ca.omf
-share/omf/users-admin/users-admin-cs.omf
-share/omf/users-admin/users-admin-de.omf
-share/omf/users-admin/users-admin-el.omf
-share/omf/users-admin/users-admin-en_GB.omf
-share/omf/users-admin/users-admin-es.omf
-share/omf/users-admin/users-admin-fr.omf
-share/omf/users-admin/users-admin-it.omf
-share/omf/users-admin/users-admin-oc.omf
-share/omf/users-admin/users-admin-pt_BR.omf
-share/omf/users-admin/users-admin-ru.omf
-share/omf/users-admin/users-admin-sv.omf
-share/omf/users-admin/users-admin-zh_CN.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/zh_CN/figures
-@dirrm share/gnome/help/users-admin/zh_CN
-@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/pt_BR/figures
-@dirrm share/gnome/help/users-admin/pt_BR
-@dirrm share/gnome/help/users-admin/oc/figures
-@dirrm share/gnome/help/users-admin/oc
-@dirrm share/gnome/help/users-admin/it/figures
-@dirrm share/gnome/help/users-admin/it
-@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/en_GB/figures
-@dirrm share/gnome/help/users-admin/en_GB
-@dirrm share/gnome/help/users-admin/el/figures
-@dirrm share/gnome/help/users-admin/el
-@dirrm share/gnome/help/users-admin/de/figures
-@dirrm share/gnome/help/users-admin/de
-@dirrm share/gnome/help/users-admin/cs/figures
-@dirrm share/gnome/help/users-admin/cs
-@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/zh_CN/figures
-@dirrm share/gnome/help/time-admin/zh_CN
-@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/pt_BR/figures
-@dirrm share/gnome/help/time-admin/pt_BR
-@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/it/figures
-@dirrm share/gnome/help/time-admin/it
-@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/en_GB/figures
-@dirrm share/gnome/help/time-admin/en_GB
-@dirrm share/gnome/help/time-admin/el/figures
-@dirrm share/gnome/help/time-admin/el
-@dirrm share/gnome/help/time-admin/de/figures
-@dirrm share/gnome/help/time-admin/de
-@dirrm share/gnome/help/time-admin/cs/figures
-@dirrm share/gnome/help/time-admin/cs
-@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/zh_CN/figures
-@dirrm share/gnome/help/shares-admin/zh_CN
-@dirrm share/gnome/help/shares-admin/sv/figures
-@dirrm share/gnome/help/shares-admin/sv
-@dirrm share/gnome/help/shares-admin/pt_BR/figures
-@dirrm share/gnome/help/shares-admin/pt_BR
-@dirrm share/gnome/help/shares-admin/oc/figures
-@dirrm share/gnome/help/shares-admin/oc
-@dirrm share/gnome/help/shares-admin/it/figures
-@dirrm share/gnome/help/shares-admin/it
-@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/en_GB/figures
-@dirrm share/gnome/help/shares-admin/en_GB
-@dirrm share/gnome/help/shares-admin/el/figures
-@dirrm share/gnome/help/shares-admin/el
-@dirrm share/gnome/help/shares-admin/de/figures
-@dirrm share/gnome/help/shares-admin/de
-@dirrm share/gnome/help/shares-admin/cs/figures
-@dirrm share/gnome/help/shares-admin/cs
-@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/zh_CN/figures
-@dirrm share/gnome/help/services-admin/zh_CN
-@dirrm share/gnome/help/services-admin/sv/figures
-@dirrm share/gnome/help/services-admin/sv
-@dirrm share/gnome/help/services-admin/pt_BR/figures
-@dirrm share/gnome/help/services-admin/pt_BR
-@dirrm share/gnome/help/services-admin/pl/figures
-@dirrm share/gnome/help/services-admin/pl
-@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/it/figures
-@dirrm share/gnome/help/services-admin/it
-@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/en_GB/figures
-@dirrm share/gnome/help/services-admin/en_GB
-@dirrm share/gnome/help/services-admin/el/figures
-@dirrm share/gnome/help/services-admin/el
-@dirrm share/gnome/help/services-admin/de/figures
-@dirrm share/gnome/help/services-admin/de
-@dirrm share/gnome/help/services-admin/cs/figures
-@dirrm share/gnome/help/services-admin/cs
-@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/zh_CN/figures
-@dirrm share/gnome/help/network-admin/zh_CN
-@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/it/figures
-@dirrm share/gnome/help/network-admin/it
-@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/en_GB/figures
-@dirrm share/gnome/help/network-admin/en_GB
-@dirrm share/gnome/help/network-admin/el/figures
-@dirrm share/gnome/help/network-admin/el
-@dirrm share/gnome/help/network-admin/de/figures
-@dirrm share/gnome/help/network-admin/de
-@dirrm share/gnome/help/network-admin/cs/figures
-@dirrm share/gnome/help/network-admin/cs
-@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/te/LC_MESSAGES
-@dirrmtry share/locale/te
-@dirrmtry share/locale/sr@latin/LC_MESSAGES
-@dirrmtry share/locale/sr@latin
-@dirrmtry share/locale/si/LC_MESSAGES
-@dirrmtry share/locale/si
-@dirrmtry share/locale/rw/LC_MESSAGES
-@dirrmtry share/locale/rw
-@dirrmtry share/locale/ps/LC_MESSAGES
-@dirrmtry share/locale/ps
-@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/mai/LC_MESSAGES
-@dirrmtry share/locale/mai
-@dirrmtry share/locale/ku/LC_MESSAGES
-@dirrmtry share/locale/ku
-@dirrmtry share/locale/dz/LC_MESSAGES
-@dirrmtry share/locale/dz
-@dirrmtry share/locale/ca@valencia/LC_MESSAGES
-@dirrmtry share/locale/ca@valencia
-@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/ast/LC_MESSAGES
-@dirrmtry share/locale/ast
-@dirrmtry share/locale/as/LC_MESSAGES
-@dirrmtry share/locale/as
diff --git a/sysutils/hal/Makefile b/sysutils/hal/Makefile
deleted file mode 100644
index 8f3503d2a..000000000
--- a/sysutils/hal/Makefile
+++ /dev/null
@@ -1,123 +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.71 2009/11/22 01:04:36 marcus Exp $
-#
-
-PORTNAME= hal
-DISTVERSION= 0.5.13
-PORTREVISION= 12
-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 intlhack ltverhack
-USE_AUTOTOOLS= libtool:22
-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
-
-USERS= haldaemon
-GROUPS= haldaemon
-
-USE_RC_SUBR= hald
-USE_GNOME_SUBR= yes
-DOCSDIR= ${PREFIX}/share/doc/${PORTNAME}-${DISTVERSION}
-PLIST_SUB= VERSION=${DISTVERSION}
-
-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 (${ARCH}=="i386" || ${ARCH}=="amd64" || ${ARCH}=="ia64")
-RUN_DEPENDS+= dmidecode:${PORTSDIR}/sysutils/dmidecode
-.endif
-
-.if defined(WITH_FIXED_MOUNTPOINTS)
-EXTRA_PATCHES+= ${FILESDIR}/extra-patch-tools_hal-storage-mount.c
-.endif
-
-.if ${OSVERSION} >= 800063
-PLIST_SUB+= USB2=""
-.else
-PLIST_SUB+= USB2="@comment "
-.endif
-
-post-patch:
- @${REINPLACE_CMD} -e '/^scriptdir = /s|[(]libexecdir[)]/scripts|(libexecdir)/hal/scripts|' \
- ${WRKSRC}/tools/Makefile.in \
- ${WRKSRC}/tools/freebsd/Makefile.in
- @${REINPLACE_CMD} -e 's|[(]libexecdir[)]/scripts|(libexecdir)/hal/scripts|' \
- ${WRKSRC}/hald/Makefile.in \
- ${WRKSRC}/tools/Makefile.in
- @${REINPLACE_CMD} -e 's|user="0"|group="operator"|g' \
- ${WRKSRC}/hal.conf.in
- @${SED} -e 's|%%LOCALBASE%%|${LOCALBASE}|' \
- < ${FILESDIR}/README.fuse > ${WRKDIR}/README.fuse
-
-post-install:
- ${MKDIR} ${DATADIR}/dist
- ${INSTALL_DATA} ${WRKSRC}/hal.conf ${DATADIR}/dist
- ${MKDIR} ${PREFIX}/share/hal/fdi/policy/10osvendor
- ${INSTALL_DATA} ${FILESDIR}/10-mouse-sysmouse.fdi \
- ${PREFIX}/share/hal/fdi/policy/10osvendor
- ${INSTALL_SCRIPT} ${FILESDIR}/mount-fuse \
- ${PREFIX}/share/hal/mount-fuse
-.if !defined(PACKAGE_BUILDING)
- @${SETENV} PKG_PREFIX=${PREFIX} \
- ${SH} ${PKGINSTALL} ${PKGNAME} POST-INSTALL
-.endif
-.if !defined(NOPORTDOCS)
- ${MKDIR} ${DOCSDIR}
- ${INSTALL_DATA} ${WRKSRC}/hald/freebsd/README \
- ${DOCSDIR}/README.freebsd
- ${INSTALL_DATA} ${WRKDIR}/README.fuse \
- ${DOCSDIR}/README.fuse
-.endif
-
-.include <bsd.port.post.mk>
diff --git a/sysutils/hal/distinfo b/sysutils/hal/distinfo
deleted file mode 100644
index 5885af28a..000000000
--- a/sysutils/hal/distinfo
+++ /dev/null
@@ -1,3 +0,0 @@
-MD5 (hal-0.5.13.tar.gz) = 46ecc5d2e5bd964fb78099688f01bb6a
-SHA256 (hal-0.5.13.tar.gz) = ebcf22a373761530920643add1a791af40954dc7349f027d1c35b0e0f7f9c8af
-SIZE (hal-0.5.13.tar.gz) = 1199224
diff --git a/sysutils/hal/files/10-mouse-sysmouse.fdi b/sysutils/hal/files/10-mouse-sysmouse.fdi
deleted file mode 100644
index cffd4f624..000000000
--- a/sysutils/hal/files/10-mouse-sysmouse.fdi
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<deviceinfo version="0.2">
- <device>
- <match key="info.capabilities" contains="input.mouse">
- <append key="info.addons" type="strlist">hald-addon-mouse-sysmouse</append>
- </match>
- </device>
-</deviceinfo>
diff --git a/sysutils/hal/files/README.fuse b/sysutils/hal/files/README.fuse
deleted file mode 100644
index 75adcab7d..000000000
--- a/sysutils/hal/files/README.fuse
+++ /dev/null
@@ -1,31 +0,0 @@
-Mounting Fuse File Systems with HAL
------------------------------------
-
-$FreeBSD$
-
-Hal supports mounting Fuse device-backed file systems (e.g. NTFS). To enable
-this feature, copy the included %%LOCALBASE%%/share/hal/mount-fuse script
-to /sbin. Make sure this script is executable. Edit the script, and change
-the FUSE_HELPER environment variable to the name of the executable which
-will actually mount the Fuse volume (e.g. for NTFS, this is ``ntfs-3g'').
-
-Finally, the script must be renamed to ``mount_FSNAME''. FSNAME is the name
-of the file system type (e.g. for NTFS, this is ``ntfs''). If there is
-already an executable in /sbin or /usr/sbin with this name, the
-existing executable must be renamed or deleted.
-
-As is stated in the examples above, overriding FreeBSD's existing NTFS
-support with Fuse's ntfs-3g is the most common use case for this. The
-ntfs-3g Fuse driver uses different mount options than FreeBSD's included
-mount_ntfs. GNOME transparently supports switching between ntfs and
-ntfs-3g. Simply edit the following GConf key in the GNOME
-Configuration Editor (i.e. gconf-editor):
-
-/system/storage/default_options/ntfs/fstype_override
-
-Set the value to ``ntfs-3g'', then add your desired ntfs-3g options to the
-following GConf key:
-
-/system/storage/default_options/ntfs-3g/mount_options
-
-Other desktop systems may have similar options.
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 f505709e1..000000000
--- a/sysutils/hal/files/extra-patch-tools_hal-storage-mount.c
+++ /dev/null
@@ -1,25 +0,0 @@
---- tools/hal-storage-mount.c.orig 2008-05-20 13:24:30.000000000 -0400
-+++ tools/hal-storage-mount.c 2008-05-20 13:30:14.000000000 -0400
-@@ -585,17 +585,11 @@ handle_mount (LibHalContext *hal_ctx,
- explicit_mount_point_given = FALSE;
- if (strlen (mount_point) == 0) {
- char *p;
--
-- 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");
-- }
-+ char *basename;
-+
-+ 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 d8367a371..000000000
--- a/sysutils/hal/files/hald.in
+++ /dev/null
@@ -1,80 +0,0 @@
-#!/bin/sh
-#
-# $FreeBSD$
-# $MCom: ports/sysutils/hal/files/hald.in,v 1.16 2009/05/17 05:02:48 marcus Exp $
-#
-# PROVIDE: hald
-# REQUIRE: DAEMON usbd devd dbus moused
-#
-# 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/mount-fuse b/sysutils/hal/files/mount-fuse
deleted file mode 100755
index a0ea8536e..000000000
--- a/sysutils/hal/files/mount-fuse
+++ /dev/null
@@ -1,153 +0,0 @@
-#!/bin/sh
-# Wrapper script for FreeBSD and PC-BSD, which takes calls from HAL
-# for running mount_ntfs, and performs it with a given FUSE helper.
-###################################################################
-
-## Modify this next variable to point to the correct FUSE helper.
-FUSE_HELPER="ntfs-3g"
-## DO NOT modify anything below this.
-
-FUSEDB="/tmp"
-if [ -n "${TMPDIR}" ]
-then
- FUSEDB=${TMPDIR}
-fi
-
-FUSEDB="${FUSEDB}/.fuse-mnts"
-MNTSTRING=""
-OPTIONS=""
-FOUNDOPT="0"
-FOUNDU="0"
-FOUNDG="0"
-FOUNDBADARG="0"
-HWDEV=""
-FOUNDDEV="0"
-
-for i in $@
-do
- if [ "$FOUNDOPT" = "1" ]
- then
- OPTIONS="${OPTIONS} -o ${i}"
- elif [ "${FOUNDU}" = "1" ]
- then
- OPTIONS="${OPTIONS} -o uid=${i}"
- elif [ "${FOUNDG}" = "1" ]
- then
- OPTIONS="${OPTIONS} -o gid=${i}"
- elif [ "${FOUNDBADARG}" = "1" ]
- then
- # We have an invalid argument flag, so ignore it and following argument
- FOUNDBADARG="0"
- else
-
- if [ "${FOUNDDEV}" = "1" ]
- then
- # Save the mount-point, will be used later
- MNTPOINT="${i}"
- FOUNDDEV="2"
- fi
-
- echo ${i}| grep -q "/dev" 2>/dev/null
- if [ "$?" = "0" -a "${FOUNDDEV}" = "0" ]
- then
- FOUNDDEV="1"
- # Lets check if we were given a fuse[] device
- # or a real device name
- echo "${i}" | grep -q "fuse" 2>/dev/null
- if [ "$?" = "0" ]
- then
- # Lets save the old fuse device name we had saved
- OLDFUSE="${i}"
-
- # Lets get the *real* device name for FUSE helper
- REALHWDEV="`cat ${FUSEDB} | grep ${i} | cut -d '=' -f 2`"
-
- # Now lets change the string we will be saving
- i="${REALHWDEV}"
- else
- # We are doing a first time mount of this device
-
- # Set the real device name for mounting
- REALHWDEV="${i}"
- fi
- fi
-
- # Add the value to our mount string if it isn't any invalid flag
- if [ "${i}" != "-o" -a "${i}" != "-u" -a "${i}" != "-C" -a "${i}" != "-g" -a "${i}" != "-m" -a "${i}" != "-a" -a "${i}" != "-i" -a "${i}" -a "-W" ]
- then
- MNTSTRING="${MNTSTRING} ${i}"
- fi
-
- fi
-
- # Check if we are on a -u user id flag now
- if [ "${i}" = "-u" ]
- then
- FOUNDU="1"
- else
- FOUNDU="0"
- fi
-
- # Check if we are on a -g group id flag now
- if [ "${i}" = "-g" ]
- then
- FOUNDG="1"
- else
- FOUNDG="0"
- fi
-
- # Check if we are on a -o option
- if [ "${i}" = "-o" ]
- then
- FOUNDOPT="1"
- else
- FOUNDOPT="0"
- fi
-
- # Check if we are on some other invalid flag
- if [ "${i}" = "-C" -o "${i}" = "-m" -o "${i}" = "-W" ]
- then
- FOUNDBADARG="1"
- else
- FOUNDBADARG="0"
- fi
-done
-
-# Save our final string which our FUSE helper will use
-FINALSTRING="${MNTSTRING} ${OPTIONS}"
-
-# Check that fuse.ko is loaded
-kldstat | grep -q fuse 2>/dev/null
-if [ "$?" != "0" ]
-then
- kldload /usr/local/modules/fuse.ko
-fi
-
-# Run the FUSE helper command now, with the options in the right order
-${FUSE_HELPER} ${FINALSTRING}
-
-# If we have an OLDFUSE variable, lets clear it from the list
-if [ ! -z "${OLDFUSE}" -a -e ${FUSEDB} ]
-then
- cat ${FUSEDB} | grep -v "${OLDFUSE}=" > /tmp/.newfuse
- mv /tmp/.newfuse ${FUSEDB}
-fi
-
-# Now lets figure out which fuse device was used and save it to DB
-NEWFUSE="`mount | tr -s ' ' | grep \" ${MNTPOINT} \" | cut -d ' ' -f 1`"
-
-# Make sure we don't already have this fuse device listed
-if [ -e ${FUSEDB} ]
-then
- cat ${FUSEDB} | grep -v "${NEWFUSE}=" > /tmp/.newfuse
- mv /tmp/.newfuse ${FUSEDB}
-else
- touch ${FUSEDB}
-fi
-
-# Save the fuse device to our DB
-echo "${NEWFUSE}=${REALHWDEV}" >> ${FUSEDB}
-
-
-# Finished!
-exit 0
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-config.h.in b/sysutils/hal/files/patch-config.h.in
deleted file mode 100644
index e1208c9f9..000000000
--- a/sysutils/hal/files/patch-config.h.in
+++ /dev/null
@@ -1,12 +0,0 @@
---- config.h.in.orig 2009-02-17 23:52:07.000000000 -0500
-+++ config.h.in 2009-02-17 23:52:41.000000000 -0500
-@@ -61,6 +61,9 @@
- /* Define to 1 if you have the `dl' library (-ldl). */
- #undef HAVE_LIBDL
-
-+/* Set if we need libusb20 */
-+#undef HAVE_LIBUSB20
-+
- /* Define to 1 if you have the `uuid' library (-luuid). */
- #undef HAVE_LIBUUID
-
diff --git a/sysutils/hal/files/patch-configure b/sysutils/hal/files/patch-configure
deleted file mode 100644
index bc4df6d96..000000000
--- a/sysutils/hal/files/patch-configure
+++ /dev/null
@@ -1,398 +0,0 @@
---- configure.orig 2009-07-18 21:14:47.000000000 -0400
-+++ configure 2009-07-18 21:14:47.000000000 -0400
-@@ -818,6 +818,8 @@ XMLTO
- HALD_OS_LIBS
- BLKID_LIBS
- BLKID_CFLAGS
-+VOLUME_ID_LIBS
-+VOLUME_ID_CFLAGS
- GLIB_LIBS
- GLIB_CFLAGS
- DBUS_LIBS
-@@ -847,6 +849,9 @@ HAVE_GPERF
- GPERF
- HAVE_CONKIT_FALSE
- HAVE_CONKIT_TRUE
-+LIBUSB20_LIBS
-+HAVE_LIBUSB20_FALSE
-+HAVE_LIBUSB20_TRUE
- HALD_BACKEND
- HALD_COMPILE_SOLARIS_FALSE
- HALD_COMPILE_SOLARIS_TRUE
-@@ -1101,6 +1106,8 @@ DBUS_CFLAGS
- DBUS_LIBS
- GLIB_CFLAGS
- GLIB_LIBS
-+VOLUME_ID_CFLAGS
-+VOLUME_ID_LIBS
- BLKID_CFLAGS
- BLKID_LIBS'
-
-@@ -1825,6 +1832,10 @@ Some influential environment variables:
- DBUS_LIBS linker flags for DBUS, overriding pkg-config
- GLIB_CFLAGS C compiler flags for GLIB, overriding pkg-config
- GLIB_LIBS linker flags for GLIB, overriding pkg-config
-+ VOLUME_ID_CFLAGS
-+ C compiler flags for VOLUME_ID, overriding pkg-config
-+ VOLUME_ID_LIBS
-+ linker flags for VOLUME_ID, overriding pkg-config
- BLKID_CFLAGS
- C compiler flags for BLKID, overriding pkg-config
- BLKID_LIBS linker flags for BLKID, overriding pkg-config
-@@ -2794,6 +2805,7 @@ fi
- glib_module="glib-2.0 >= 2.10.0 gobject-2.0 > 2.10.0 dbus-glib-1 >= 0.61"
- dbus_module="dbus-1 >= 0.61"
- blkid_module="blkid >= 1.43"
-+volume_id_module="libvolume_id >= 0.77"
- polkit_module="polkit >= 0.5"
-
- # libtool versioning - this applies to libhal and libhal-storage
-@@ -19129,6 +19141,9 @@ else
- fi
-
-
-+USE_LIBUSB20=no
-+USE_LIBUSB=no
-+LIBUSB20_LIBS=""
-
- # Check whether --with-backend was given.
- if test "${with_backend+set}" = set; then
-@@ -19186,6 +19201,184 @@ else
- fi
-
-
-+if test "x$HALD_BACKEND" = "xfreebsd"; then
-+ { $as_echo "$as_me:$LINENO: checking for libusb20_dev_get_info in -lusb20" >&5
-+$as_echo_n "checking for libusb20_dev_get_info in -lusb20... " >&6; }
-+if test "${ac_cv_lib_usb20_libusb20_dev_get_info+set}" = set; then
-+ $as_echo_n "(cached) " >&6
-+else
-+ ac_check_lib_save_LIBS=$LIBS
-+LIBS="-lusb20 $LIBS"
-+cat >conftest.$ac_ext <<_ACEOF
-+/* confdefs.h. */
-+_ACEOF
-+cat confdefs.h >>conftest.$ac_ext
-+cat >>conftest.$ac_ext <<_ACEOF
-+/* end confdefs.h. */
-+
-+/* 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 libusb20_dev_get_info ();
-+int
-+main ()
-+{
-+return libusb20_dev_get_info ();
-+ ;
-+ 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 ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
-+$as_echo "$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
-+ $as_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 && {
-+ test "$cross_compiling" = yes ||
-+ $as_test_x conftest$ac_exeext
-+ }; then
-+ ac_cv_lib_usb20_libusb20_dev_get_info=yes
-+else
-+ $as_echo "$as_me: failed program was:" >&5
-+sed 's/^/| /' conftest.$ac_ext >&5
-+
-+ ac_cv_lib_usb20_libusb20_dev_get_info=no
-+fi
-+
-+rm -rf conftest.dSYM
-+rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
-+ conftest$ac_exeext conftest.$ac_ext
-+LIBS=$ac_check_lib_save_LIBS
-+fi
-+{ $as_echo "$as_me:$LINENO: result: $ac_cv_lib_usb20_libusb20_dev_get_info" >&5
-+$as_echo "$ac_cv_lib_usb20_libusb20_dev_get_info" >&6; }
-+if test "x$ac_cv_lib_usb20_libusb20_dev_get_info" = x""yes; then
-+ USE_LIBUSB20=yes
-+else
-+ USE_LIBUSB20=no
-+fi
-+
-+fi
-+if test "x$USE_LIBUSB20" = "xno"; then
-+ { $as_echo "$as_me:$LINENO: checking for libusb20_dev_get_info in -lusb" >&5
-+$as_echo_n "checking for libusb20_dev_get_info in -lusb... " >&6; }
-+if test "${ac_cv_lib_usb_libusb20_dev_get_info+set}" = set; then
-+ $as_echo_n "(cached) " >&6
-+else
-+ ac_check_lib_save_LIBS=$LIBS
-+LIBS="-lusb $LIBS"
-+cat >conftest.$ac_ext <<_ACEOF
-+/* confdefs.h. */
-+_ACEOF
-+cat confdefs.h >>conftest.$ac_ext
-+cat >>conftest.$ac_ext <<_ACEOF
-+/* end confdefs.h. */
-+
-+/* 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 libusb20_dev_get_info ();
-+int
-+main ()
-+{
-+return libusb20_dev_get_info ();
-+ ;
-+ 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 ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
-+$as_echo "$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
-+ $as_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 && {
-+ test "$cross_compiling" = yes ||
-+ $as_test_x conftest$ac_exeext
-+ }; then
-+ ac_cv_lib_usb_libusb20_dev_get_info=yes
-+else
-+ $as_echo "$as_me: failed program was:" >&5
-+sed 's/^/| /' conftest.$ac_ext >&5
-+
-+ ac_cv_lib_usb_libusb20_dev_get_info=no
-+fi
-+
-+rm -rf conftest.dSYM
-+rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
-+ conftest$ac_exeext conftest.$ac_ext
-+LIBS=$ac_check_lib_save_LIBS
-+fi
-+{ $as_echo "$as_me:$LINENO: result: $ac_cv_lib_usb_libusb20_dev_get_info" >&5
-+$as_echo "$ac_cv_lib_usb_libusb20_dev_get_info" >&6; }
-+if test "x$ac_cv_lib_usb_libusb20_dev_get_info" = x""yes; then
-+ USE_LIBUSB=yes
-+else
-+ USE_LIBUSB=no
-+fi
-+
-+fi
-+ if test "x$USE_LIBUSB20" = "xyes"; then
-+ HAVE_LIBUSB20_TRUE=
-+ HAVE_LIBUSB20_FALSE='#'
-+else
-+ HAVE_LIBUSB20_TRUE='#'
-+ HAVE_LIBUSB20_FALSE=
-+fi
-+
-+ if test "x$USE_LIBUSB" = "xyes"; then
-+ HAVE_LIBUSB20_TRUE=
-+ HAVE_LIBUSB20_FALSE='#'
-+else
-+ HAVE_LIBUSB20_TRUE='#'
-+ HAVE_LIBUSB20_FALSE=
-+fi
-+
-+if test "x$USE_LIBUSB20" = "xyes"; then
-+
-+cat >>confdefs.h <<\_ACEOF
-+#define HAVE_LIBUSB20 1
-+_ACEOF
-+
-+ LIBUSB20_LIBS="-lusb20"
-+elif test "x$USE_LIBUSB" = "xyes"; then
-+
-+cat >>confdefs.h <<\_ACEOF
-+#define HAVE_LIBUSB20 1
-+_ACEOF
-+
-+ LIBUSB20_LIBS="-lusb"
-+fi
-+
-
-
- cat >>confdefs.h <<_ACEOF
-@@ -19943,8 +20136,132 @@ fi
- { $as_echo "$as_me:$LINENO: result: $have_glib_2_14" >&5
- $as_echo "$have_glib_2_14" >&6; }
-
-+case "$host" in
-+*-*-freebsd*)
-+
-+pkg_failed=no
-+{ $as_echo "$as_me:$LINENO: checking for VOLUME_ID" >&5
-+$as_echo_n "checking for VOLUME_ID... " >&6; }
-+
-+if test -n "$PKG_CONFIG"; then
-+ if test -n "$VOLUME_ID_CFLAGS"; then
-+ pkg_cv_VOLUME_ID_CFLAGS="$VOLUME_ID_CFLAGS"
-+ else
-+ if test -n "$PKG_CONFIG" && \
-+ { ($as_echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"\$volume_id_module\"") >&5
-+ ($PKG_CONFIG --exists --print-errors "$volume_id_module") 2>&5
-+ ac_status=$?
-+ $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+ (exit $ac_status); }; then
-+ pkg_cv_VOLUME_ID_CFLAGS=`$PKG_CONFIG --cflags "$volume_id_module" 2>/dev/null`
-+else
-+ pkg_failed=yes
-+fi
-+ fi
-+else
-+ pkg_failed=untried
-+fi
-+if test -n "$PKG_CONFIG"; then
-+ if test -n "$VOLUME_ID_LIBS"; then
-+ pkg_cv_VOLUME_ID_LIBS="$VOLUME_ID_LIBS"
-+ else
-+ if test -n "$PKG_CONFIG" && \
-+ { ($as_echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"\$volume_id_module\"") >&5
-+ ($PKG_CONFIG --exists --print-errors "$volume_id_module") 2>&5
-+ ac_status=$?
-+ $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+ (exit $ac_status); }; then
-+ pkg_cv_VOLUME_ID_LIBS=`$PKG_CONFIG --libs "$volume_id_module" 2>/dev/null`
-+else
-+ pkg_failed=yes
-+fi
-+ fi
-+else
-+ pkg_failed=untried
-+fi
-+
-+
-+
-+if test $pkg_failed = yes; then
-+
-+if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then
-+ _pkg_short_errors_supported=yes
-+else
-+ _pkg_short_errors_supported=no
-+fi
-+ if test $_pkg_short_errors_supported = yes; then
-+ VOLUME_ID_PKG_ERRORS=`$PKG_CONFIG --short-errors --errors-to-stdout --print-errors "$volume_id_module"`
-+ else
-+ VOLUME_ID_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "$volume_id_module"`
-+ fi
-+ # Put the nasty error message in config.log where it belongs
-+ echo "$VOLUME_ID_PKG_ERRORS" >&5
-+
-+ { { $as_echo "$as_me:$LINENO: error: Package requirements ($volume_id_module) were not met:
-+
-+$VOLUME_ID_PKG_ERRORS
-+
-+Consider adjusting the PKG_CONFIG_PATH environment variable if you
-+installed software in a non-standard prefix.
-+
-+Alternatively, you may set the environment variables VOLUME_ID_CFLAGS
-+and VOLUME_ID_LIBS to avoid the need to call pkg-config.
-+See the pkg-config man page for more details.
-+" >&5
-+$as_echo "$as_me: error: Package requirements ($volume_id_module) were not met:
-+
-+$VOLUME_ID_PKG_ERRORS
-+
-+Consider adjusting the PKG_CONFIG_PATH environment variable if you
-+installed software in a non-standard prefix.
-+
-+Alternatively, you may set the environment variables VOLUME_ID_CFLAGS
-+and VOLUME_ID_LIBS to avoid the need to call pkg-config.
-+See the pkg-config man page for more details.
-+" >&2;}
-+ { (exit 1); exit 1; }; }
-+elif test $pkg_failed = untried; then
-+ { { $as_echo "$as_me:$LINENO: error: in \`$ac_pwd':" >&5
-+$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
-+{ { $as_echo "$as_me:$LINENO: error: The pkg-config script could not be found or is too old. Make sure it
-+is in your PATH or set the PKG_CONFIG environment variable to the full
-+path to pkg-config.
-+
-+Alternatively, you may set the environment variables VOLUME_ID_CFLAGS
-+and VOLUME_ID_LIBS to avoid the need to call pkg-config.
-+See the pkg-config man page for more details.
-+
-+To get pkg-config, see <http://pkg-config.freedesktop.org/>.
-+See \`config.log' for more details." >&5
-+$as_echo "$as_me: error: The pkg-config script could not be found or is too old. Make sure it
-+is in your PATH or set the PKG_CONFIG environment variable to the full
-+path to pkg-config.
-+
-+Alternatively, you may set the environment variables VOLUME_ID_CFLAGS
-+and VOLUME_ID_LIBS to avoid the need to call pkg-config.
-+See the pkg-config man page for more details.
-+
-+To get pkg-config, see <http://pkg-config.freedesktop.org/>.
-+See \`config.log' for more details." >&2;}
-+ { (exit 1); exit 1; }; }; }
-+else
-+ VOLUME_ID_CFLAGS=$pkg_cv_VOLUME_ID_CFLAGS
-+ VOLUME_ID_LIBS=$pkg_cv_VOLUME_ID_LIBS
-+ { $as_echo "$as_me:$LINENO: result: yes" >&5
-+$as_echo "yes" >&6; }
-+ :
-+fi
-+
-+
-+ ;;
-+*)
-+ ;;
-+esac
-+
- # blkid
- case "$host" in
-+*-*-freebsd*)
-+ ;;
- *-*-solaris*)
- ;;
- *)
-@@ -21441,6 +21758,20 @@ $as_echo "$as_me: error: conditional \"H
- Usually this means the macro was only invoked conditionally." >&2;}
- { (exit 1); exit 1; }; }
- fi
-+if test -z "${HAVE_LIBUSB20_TRUE}" && test -z "${HAVE_LIBUSB20_FALSE}"; then
-+ { { $as_echo "$as_me:$LINENO: error: conditional \"HAVE_LIBUSB20\" was never defined.
-+Usually this means the macro was only invoked conditionally." >&5
-+$as_echo "$as_me: error: conditional \"HAVE_LIBUSB20\" was never defined.
-+Usually this means the macro was only invoked conditionally." >&2;}
-+ { (exit 1); exit 1; }; }
-+fi
-+if test -z "${HAVE_LIBUSB20_TRUE}" && test -z "${HAVE_LIBUSB20_FALSE}"; then
-+ { { $as_echo "$as_me:$LINENO: error: conditional \"HAVE_LIBUSB20\" was never defined.
-+Usually this means the macro was only invoked conditionally." >&5
-+$as_echo "$as_me: error: conditional \"HAVE_LIBUSB20\" was never defined.
-+Usually this means the macro was only invoked conditionally." >&2;}
-+ { (exit 1); exit 1; }; }
-+fi
- if test -z "${HAVE_CONKIT_TRUE}" && test -z "${HAVE_CONKIT_FALSE}"; then
- { { $as_echo "$as_me:$LINENO: error: conditional \"HAVE_CONKIT\" was never defined.
- Usually this means the macro was only invoked conditionally." >&5
diff --git a/sysutils/hal/files/patch-configure.in b/sysutils/hal/files/patch-configure.in
deleted file mode 100644
index 84e12d187..000000000
--- a/sysutils/hal/files/patch-configure.in
+++ /dev/null
@@ -1,64 +0,0 @@
---- configure.in.orig 2009-05-10 15:43:52.000000000 -0400
-+++ configure.in 2009-05-17 00:53:29.000000000 -0400
-@@ -14,6 +14,7 @@ AM_MAINTAINER_MODE
- glib_module="glib-2.0 >= 2.10.0 gobject-2.0 > 2.10.0 dbus-glib-1 >= 0.61"
- dbus_module="dbus-1 >= 0.61"
- blkid_module="blkid >= 1.43"
-+volume_id_module="libvolume_id >= 0.77"
- polkit_module="polkit >= 0.5"
-
- # libtool versioning - this applies to libhal and libhal-storage
-@@ -477,6 +478,9 @@ if test "x$with_libpci" != xno ; then
- fi
- AM_CONDITIONAL([HAVE_LIBPCI], [test "x$USE_LIBPCI" = "xyes"])
-
-+USE_LIBUSB20=no
-+USE_LIBUSB=no
-+LIBUSB20_LIBS=""
- AC_ARG_WITH([backend],
- AS_HELP_STRING([--with-backend=<name>],
- [backend to use (linux/solaris/freebsd/dummy)]),
-@@ -504,6 +508,22 @@ AM_CONDITIONAL(HALD_COMPILE_LINUX, [test
- AM_CONDITIONAL(HALD_COMPILE_FREEBSD, [test x$HALD_BACKEND = xfreebsd], [Compiling for FreeBSD])
- AM_CONDITIONAL(HALD_COMPILE_SOLARIS, [test x$HALD_BACKEND = xsolaris], [Compiling for Solaris])
- AC_SUBST(HALD_BACKEND)
-+if test "x$HALD_BACKEND" = "xfreebsd"; then
-+ AC_CHECK_LIB([usb20], [libusb20_dev_get_info], [USE_LIBUSB20=yes], [USE_LIBUSB20=no])
-+fi
-+if test "x$USE_LIBUSB20" = "xno"; then
-+ AC_CHECK_LIB([usb], [libusb20_dev_get_info], [USE_LIBUSB=yes], [USE_LIBUSB=no])
-+fi
-+AM_CONDITIONAL([HAVE_LIBUSB20],[test "x$USE_LIBUSB20" = "xyes"])
-+AM_CONDITIONAL([HAVE_LIBUSB20],[test "x$USE_LIBUSB" = "xyes"])
-+if test "x$USE_LIBUSB20" = "xyes"; then
-+ AC_DEFINE(HAVE_LIBUSB20, 1, [Set if we need libusb20])
-+ LIBUSB20_LIBS="-lusb20"
-+elif test "x$USE_LIBUSB" = "xyes"; then
-+ AC_DEFINE(HAVE_LIBUSB20, 1, [Set if we need libsub20])
-+ LIBUSB20_LIBS="-lusb"
-+fi
-+AC_SUBST(LIBUSB20_LIBS)
-
- dnl DBUS API is subject to changes
- AC_DEFINE_UNQUOTED(DBUS_API_SUBJECT_TO_CHANGE, [], [DBUS API is subject to change])
-@@ -685,8 +705,20 @@ else
- fi
- AC_MSG_RESULT($have_glib_2_14)
-
-+case "$host" in
-+*-*-freebsd*)
-+ PKG_CHECK_MODULES(VOLUME_ID, [$volume_id_module])
-+ AC_SUBST(VOLUME_ID_CFLAGS)
-+ AC_SUBST(VOLUME_ID_LIBS)
-+ ;;
-+*)
-+ ;;
-+esac
-+
- # blkid
- case "$host" in
-+*-*-freebsd*)
-+ ;;
- *-*-solaris*)
- ;;
- *)
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-fdi_policy_10osvendor_10-power-mgmt-policy.fdi b/sysutils/hal/files/patch-fdi_policy_10osvendor_10-power-mgmt-policy.fdi
deleted file mode 100644
index 1391709f8..000000000
--- a/sysutils/hal/files/patch-fdi_policy_10osvendor_10-power-mgmt-policy.fdi
+++ /dev/null
@@ -1,13 +0,0 @@
---- fdi/policy/10osvendor/10-power-mgmt-policy.fdi.orig 2008-05-07 19:21:15.000000000 -0400
-+++ fdi/policy/10osvendor/10-power-mgmt-policy.fdi 2009-01-30 17:41:05.000000000 -0500
-@@ -10,7 +10,9 @@
-
- <device>
- <match key="power_management.type" string="acpi">
-- <append key="info.addons" type="strlist">hald-addon-acpi</append>
-+ <match key="/org/freedesktop/Hal/devices/computer:system.kernel.name" string="Linux">
-+ <append key="info.addons" type="strlist">hald-addon-acpi</append>
-+ </match>
- </match>
- </device>
-
diff --git a/sysutils/hal/files/patch-fdi_policy_10osvendor_10-x11-input.fdi b/sysutils/hal/files/patch-fdi_policy_10osvendor_10-x11-input.fdi
deleted file mode 100644
index bb18f3310..000000000
--- a/sysutils/hal/files/patch-fdi_policy_10osvendor_10-x11-input.fdi
+++ /dev/null
@@ -1,31 +0,0 @@
---- fdi/policy/10osvendor/10-x11-input.fdi.orig 2009-06-26 03:28:39.000000000 -0400
-+++ fdi/policy/10osvendor/10-x11-input.fdi 2009-07-18 21:19:15.000000000 -0400
-@@ -7,15 +7,6 @@
- <merge key="input.x11_driver" type="string">evdev</merge>
- </match>
-
-- <!-- FIXME: Support tablets too. -->
-- <match key="info.capabilities" contains="input.mouse">
-- <merge key="input.x11_driver" type="string">mouse</merge>
-- <match key="/org/freedesktop/Hal/devices/computer:system.kernel.name"
-- string="Linux">
-- <merge key="input.x11_driver" type="string">evdev</merge>
-- </match>
-- </match>
--
- <match key="info.capabilities" contains="input.tablet">
- <match key="/org/freedesktop/Hal/devices/computer:system.kernel.name"
- string="Linux">
-@@ -23,10 +14,10 @@
- </match>
- </match>
-
-- <match key="info.capabilities" contains="input.keys">
-+ <match key="info.capabilities" contains="input.keyboard">
- <!-- If we're using Linux, we use evdev by default (falling back to
- keyboard otherwise). -->
-- <merge key="input.x11_driver" type="string">keyboard</merge>
-+ <merge key="input.x11_driver" type="string">kbd</merge>
- <match key="/org/freedesktop/Hal/devices/computer:system.kernel.name"
- string="Linux">
- <merge key="input.x11_driver" type="string">evdev</merge>
diff --git a/sysutils/hal/files/patch-hald_freebsd_Makefile.am b/sysutils/hal/files/patch-hald_freebsd_Makefile.am
deleted file mode 100644
index 9a6b8c83d..000000000
--- a/sysutils/hal/files/patch-hald_freebsd_Makefile.am
+++ /dev/null
@@ -1,14 +0,0 @@
---- hald/freebsd/Makefile.am.orig 2009-02-17 18:58:12.000000000 -0500
-+++ hald/freebsd/Makefile.am 2009-02-18 00:16:12.000000000 -0500
-@@ -54,4 +54,11 @@ libhald_freebsd_la_SOURCES = \
-
- libhald_freebsd_la_LDFLAGS = -lcam
-
-+if HAVE_LIBUSB20
-+libhald_freebsd_la_SOURCES += \
-+ hf-usb2.c \
-+ hf-usb2.h
-+libhald_freebsd_la_LDFLAGS += @LIBUSB20_LIBS@
-+endif
-+
- EXTRA_DIST = README TODO
diff --git a/sysutils/hal/files/patch-hald_freebsd_Makefile.in b/sysutils/hal/files/patch-hald_freebsd_Makefile.in
deleted file mode 100644
index 44dbf8adc..000000000
--- a/sysutils/hal/files/patch-hald_freebsd_Makefile.in
+++ /dev/null
@@ -1,109 +0,0 @@
---- hald/freebsd/Makefile.in.orig 2009-05-17 00:43:12.000000000 -0400
-+++ hald/freebsd/Makefile.in 2009-05-17 00:43:12.000000000 -0400
-@@ -32,6 +32,11 @@ PRE_UNINSTALL = :
- POST_UNINSTALL = :
- build_triplet = @build@
- host_triplet = @host@
-+@HAVE_LIBUSB20_TRUE@am__append_1 = \
-+@HAVE_LIBUSB20_TRUE@ hf-usb2.c \
-+@HAVE_LIBUSB20_TRUE@ hf-usb2.h
-+
-+@HAVE_LIBUSB20_TRUE@am__append_2 = @LIBUSB20_LIBS@
- subdir = hald/freebsd
- DIST_COMMON = README $(srcdir)/Makefile.am $(srcdir)/Makefile.in TODO
- ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
-@@ -44,11 +49,20 @@ CONFIG_HEADER = $(top_builddir)/config.h
- CONFIG_CLEAN_FILES =
- LTLIBRARIES = $(noinst_LTLIBRARIES)
- libhald_freebsd_la_LIBADD =
-+am__libhald_freebsd_la_SOURCES_DIST = hf-acpi.c hf-acpi.h hf-ata.c \
-+ hf-ata.h hf-block.c hf-block.h hf-computer.c hf-computer.h \
-+ hf-devd.c hf-devd.h hf-devtree.c hf-devtree.h hf-drm.c \
-+ hf-drm.h hf-net.c hf-net.h hf-osspec.h hf-pci.c hf-pci.h \
-+ hf-pcmcia.c hf-pcmcia.h hf-scsi.c hf-scsi.h hf-serial.c \
-+ hf-serial.h hf-sound.c hf-sound.h hf-storage.c hf-storage.h \
-+ hf-usb.c hf-usb.h hf-util.c hf-util.h hf-volume.c hf-volume.h \
-+ osspec.c hal-file-monitor.c hf-usb2.c hf-usb2.h
-+@HAVE_LIBUSB20_TRUE@am__objects_1 = hf-usb2.lo
- am_libhald_freebsd_la_OBJECTS = hf-acpi.lo hf-ata.lo hf-block.lo \
- hf-computer.lo hf-devd.lo hf-devtree.lo hf-drm.lo hf-net.lo \
- hf-pci.lo hf-pcmcia.lo hf-scsi.lo hf-serial.lo hf-sound.lo \
- hf-storage.lo hf-usb.lo hf-util.lo hf-volume.lo osspec.lo \
-- hal-file-monitor.lo
-+ hal-file-monitor.lo $(am__objects_1)
- libhald_freebsd_la_OBJECTS = $(am_libhald_freebsd_la_OBJECTS)
- libhald_freebsd_la_LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) \
- $(LIBTOOLFLAGS) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \
-@@ -67,7 +81,7 @@ LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLF
- --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) \
- $(LDFLAGS) -o $@
- SOURCES = $(libhald_freebsd_la_SOURCES)
--DIST_SOURCES = $(libhald_freebsd_la_SOURCES)
-+DIST_SOURCES = $(am__libhald_freebsd_la_SOURCES_DIST)
- RECURSIVE_TARGETS = all-recursive check-recursive dvi-recursive \
- html-recursive info-recursive install-data-recursive \
- install-dvi-recursive install-exec-recursive \
-@@ -250,46 +264,15 @@ AM_CPPFLAGS = \
- @GLIB_CFLAGS@ @DBUS_CFLAGS@ @POLKIT_CFLAGS@
-
- @HALD_COMPILE_FREEBSD_TRUE@noinst_LTLIBRARIES = libhald_freebsd.la
--libhald_freebsd_la_SOURCES = \
-- hf-acpi.c \
-- hf-acpi.h \
-- hf-ata.c \
-- hf-ata.h \
-- hf-block.c \
-- hf-block.h \
-- hf-computer.c \
-- hf-computer.h \
-- hf-devd.c \
-- hf-devd.h \
-- hf-devtree.c \
-- hf-devtree.h \
-- hf-drm.c \
-- hf-drm.h \
-- hf-net.c \
-- hf-net.h \
-- hf-osspec.h \
-- hf-pci.c \
-- hf-pci.h \
-- hf-pcmcia.c \
-- hf-pcmcia.h \
-- hf-scsi.c \
-- hf-scsi.h \
-- hf-serial.c \
-- hf-serial.h \
-- hf-sound.c \
-- hf-sound.h \
-- hf-storage.c \
-- hf-storage.h \
-- hf-usb.c \
-- hf-usb.h \
-- hf-util.c \
-- hf-util.h \
-- hf-volume.c \
-- hf-volume.h \
-- osspec.c \
-- hal-file-monitor.c
--
--libhald_freebsd_la_LDFLAGS = -lcam
-+libhald_freebsd_la_SOURCES = hf-acpi.c hf-acpi.h hf-ata.c hf-ata.h \
-+ hf-block.c hf-block.h hf-computer.c hf-computer.h hf-devd.c \
-+ hf-devd.h hf-devtree.c hf-devtree.h hf-drm.c hf-drm.h hf-net.c \
-+ hf-net.h hf-osspec.h hf-pci.c hf-pci.h hf-pcmcia.c hf-pcmcia.h \
-+ hf-scsi.c hf-scsi.h hf-serial.c hf-serial.h hf-sound.c \
-+ hf-sound.h hf-storage.c hf-storage.h hf-usb.c hf-usb.h \
-+ hf-util.c hf-util.h hf-volume.c hf-volume.h osspec.c \
-+ hal-file-monitor.c $(am__append_1)
-+libhald_freebsd_la_LDFLAGS = -lcam $(am__append_2)
- EXTRA_DIST = README TODO
- all: all-recursive
-
-@@ -358,6 +341,7 @@ distclean-compile:
- @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/hf-sound.Plo@am__quote@
- @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/hf-storage.Plo@am__quote@
- @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/hf-usb.Plo@am__quote@
-+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/hf-usb2.Plo@am__quote@
- @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/hf-util.Plo@am__quote@
- @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/hf-volume.Plo@am__quote@
- @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/osspec.Plo@am__quote@
diff --git a/sysutils/hal/files/patch-hald_freebsd_addons_Makefile.in b/sysutils/hal/files/patch-hald_freebsd_addons_Makefile.in
deleted file mode 100644
index f554c0650..000000000
--- a/sysutils/hal/files/patch-hald_freebsd_addons_Makefile.in
+++ /dev/null
@@ -1,93 +0,0 @@
---- hald/freebsd/addons/Makefile.in.orig 2008-12-13 12:08:36.000000000 -0500
-+++ hald/freebsd/addons/Makefile.in 2008-12-20 21:16:41.000000000 -0500
-@@ -33,7 +33,8 @@ POST_UNINSTALL = :
- build_triplet = @build@
- host_triplet = @host@
- @HALD_COMPILE_FREEBSD_TRUE@libexec_PROGRAMS = \
--@HALD_COMPILE_FREEBSD_TRUE@ hald-addon-storage$(EXEEXT)
-+@HALD_COMPILE_FREEBSD_TRUE@ hald-addon-storage$(EXEEXT) \
-+@HALD_COMPILE_FREEBSD_TRUE@ hald-addon-mouse-sysmouse$(EXEEXT)
- subdir = hald/freebsd/addons
- DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in
- ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
-@@ -47,6 +48,15 @@ CONFIG_CLEAN_FILES =
- am__installdirs = "$(DESTDIR)$(libexecdir)"
- libexecPROGRAMS_INSTALL = $(INSTALL_PROGRAM)
- PROGRAMS = $(libexec_PROGRAMS)
-+am_hald_addon_mouse_sysmouse_OBJECTS = \
-+ hald_addon_mouse_sysmouse-addon-mouse.$(OBJEXT)
-+hald_addon_mouse_sysmouse_OBJECTS = \
-+ $(am_hald_addon_mouse_sysmouse_OBJECTS)
-+hald_addon_mouse_sysmouse_DEPENDENCIES = $(top_builddir)/hald/freebsd/libprobe/libhald_freebsd_probe.la
-+hald_addon_mouse_sysmouse_LINK = $(LIBTOOL) --tag=CC \
-+ $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=link $(CCLD) \
-+ $(hald_addon_mouse_sysmouse_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) \
-+ $(LDFLAGS) -o $@
- am_hald_addon_storage_OBJECTS = addon-storage.$(OBJEXT)
- hald_addon_storage_OBJECTS = $(am_hald_addon_storage_OBJECTS)
- hald_addon_storage_DEPENDENCIES = $(top_builddir)/hald/freebsd/libprobe/libhald_freebsd_probe.la
-@@ -62,8 +72,10 @@ CCLD = $(CC)
- LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
- --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) \
- $(LDFLAGS) -o $@
--SOURCES = $(hald_addon_storage_SOURCES)
--DIST_SOURCES = $(hald_addon_storage_SOURCES)
-+SOURCES = $(hald_addon_mouse_sysmouse_SOURCES) \
-+ $(hald_addon_storage_SOURCES)
-+DIST_SOURCES = $(hald_addon_mouse_sysmouse_SOURCES) \
-+ $(hald_addon_storage_SOURCES)
- ETAGS = etags
- CTAGS = ctags
- DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
-@@ -229,6 +241,12 @@ hald_addon_storage_SOURCES = addon-stora
- hald_addon_storage_LDADD = \
- $(top_builddir)/hald/freebsd/libprobe/libhald_freebsd_probe.la
-
-+hald_addon_mouse_sysmouse_SOURCES = addon-mouse.c
-+hald_addon_mouse_sysmouse_CFLAGS = $(AM_CPPFLAGS) @GLIB_CFLAGS@
-+hald_addon_mouse_sysmouse_LDADD = @GLIB_LIBS@ \
-+ -lutil \
-+ $(top_builddir)/hald/freebsd/libprobe/libhald_freebsd_probe.la
-+
- all: all-am
-
- .SUFFIXES:
-@@ -290,6 +308,9 @@ clean-libexecPROGRAMS:
- echo " rm -f $$p $$f"; \
- rm -f $$p $$f ; \
- done
-+hald-addon-mouse-sysmouse$(EXEEXT): $(hald_addon_mouse_sysmouse_OBJECTS) $(hald_addon_mouse_sysmouse_DEPENDENCIES)
-+ @rm -f hald-addon-mouse-sysmouse$(EXEEXT)
-+ $(hald_addon_mouse_sysmouse_LINK) $(hald_addon_mouse_sysmouse_OBJECTS) $(hald_addon_mouse_sysmouse_LDADD) $(LIBS)
- hald-addon-storage$(EXEEXT): $(hald_addon_storage_OBJECTS) $(hald_addon_storage_DEPENDENCIES)
- @rm -f hald-addon-storage$(EXEEXT)
- $(LINK) $(hald_addon_storage_OBJECTS) $(hald_addon_storage_LDADD) $(LIBS)
-@@ -301,6 +322,7 @@ distclean-compile:
- -rm -f *.tab.c
-
- @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/addon-storage.Po@am__quote@
-+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/hald_addon_mouse_sysmouse-addon-mouse.Po@am__quote@
-
- .c.o:
- @am__fastdepCC_TRUE@ $(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
-@@ -323,6 +345,20 @@ distclean-compile:
- @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
- @am__fastdepCC_FALSE@ $(LTCOMPILE) -c -o $@ $<
-
-+hald_addon_mouse_sysmouse-addon-mouse.o: addon-mouse.c
-+@am__fastdepCC_TRUE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(hald_addon_mouse_sysmouse_CFLAGS) $(CFLAGS) -MT hald_addon_mouse_sysmouse-addon-mouse.o -MD -MP -MF $(DEPDIR)/hald_addon_mouse_sysmouse-addon-mouse.Tpo -c -o hald_addon_mouse_sysmouse-addon-mouse.o `test -f 'addon-mouse.c' || echo '$(srcdir)/'`addon-mouse.c
-+@am__fastdepCC_TRUE@ mv -f $(DEPDIR)/hald_addon_mouse_sysmouse-addon-mouse.Tpo $(DEPDIR)/hald_addon_mouse_sysmouse-addon-mouse.Po
-+@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='addon-mouse.c' object='hald_addon_mouse_sysmouse-addon-mouse.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) $(hald_addon_mouse_sysmouse_CFLAGS) $(CFLAGS) -c -o hald_addon_mouse_sysmouse-addon-mouse.o `test -f 'addon-mouse.c' || echo '$(srcdir)/'`addon-mouse.c
-+
-+hald_addon_mouse_sysmouse-addon-mouse.obj: addon-mouse.c
-+@am__fastdepCC_TRUE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(hald_addon_mouse_sysmouse_CFLAGS) $(CFLAGS) -MT hald_addon_mouse_sysmouse-addon-mouse.obj -MD -MP -MF $(DEPDIR)/hald_addon_mouse_sysmouse-addon-mouse.Tpo -c -o hald_addon_mouse_sysmouse-addon-mouse.obj `if test -f 'addon-mouse.c'; then $(CYGPATH_W) 'addon-mouse.c'; else $(CYGPATH_W) '$(srcdir)/addon-mouse.c'; fi`
-+@am__fastdepCC_TRUE@ mv -f $(DEPDIR)/hald_addon_mouse_sysmouse-addon-mouse.Tpo $(DEPDIR)/hald_addon_mouse_sysmouse-addon-mouse.Po
-+@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='addon-mouse.c' object='hald_addon_mouse_sysmouse-addon-mouse.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) $(hald_addon_mouse_sysmouse_CFLAGS) $(CFLAGS) -c -o hald_addon_mouse_sysmouse-addon-mouse.obj `if test -f 'addon-mouse.c'; then $(CYGPATH_W) 'addon-mouse.c'; else $(CYGPATH_W) '$(srcdir)/addon-mouse.c'; fi`
-+
- mostlyclean-libtool:
- -rm -f *.lo
-
diff --git a/sysutils/hal/files/patch-hald_freebsd_addons_addon-mouse.c b/sysutils/hal/files/patch-hald_freebsd_addons_addon-mouse.c
deleted file mode 100644
index cf9d96346..000000000
--- a/sysutils/hal/files/patch-hald_freebsd_addons_addon-mouse.c
+++ /dev/null
@@ -1,374 +0,0 @@
---- hald/freebsd/addons/addon-mouse.c.orig 2009-01-25 16:54:29.000000000 -0500
-+++ hald/freebsd/addons/addon-mouse.c 2009-01-25 23:00:48.000000000 -0500
-@@ -0,0 +1,371 @@
-+/***************************************************************************
-+ * CVSID: $Id: patch-hald_freebsd_addons_addon-mouse.c,v 1.4 2009-05-17 05:02:48 marcus Exp $
-+ *
-+ * addon-mouse.c : poll mice to disable moused(8) owned devices
-+ *
-+ * Copyright (C) 2008 Joe Marcus Clarke
-+ *
-+ * 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 <sys/param.h>
-+#include <sys/types.h>
-+#include <sys/event.h>
-+#include <sys/time.h>
-+#include <sys/proc.h>
-+#if __FreeBSD_version >= 800058
-+#include <sys/types.h>
-+#include <sys/user.h>
-+#include <sys/sysctl.h>
-+#include <libutil.h>
-+#endif
-+#include <string.h>
-+#include <stdlib.h>
-+#include <assert.h>
-+#include <unistd.h>
-+#include <glib.h>
-+
-+#include "libhal/libhal.h"
-+
-+#include "../libprobe/hfp.h"
-+
-+#if __FreeBSD_version < 800058
-+#define CMD "/usr/bin/fstat %s"
-+#endif
-+
-+#define MOUSED_DEVICE "/dev/sysmouse"
-+#define MOUSED_PROC_NAME "moused"
-+#define XORG_PROC_NAME "Xorg"
-+#define NO_PID -1
-+
-+static struct
-+{
-+ const struct timespec update_interval;
-+ char *device_file;
-+ struct timespec next_update;
-+} addon = { { 2, 0 } };
-+
-+static int kd = -1;
-+
-+#if __FreeBSD_version >= 800058
-+static struct kinfo_proc *
-+hfp_kinfo_getproc (int *cntp)
-+{
-+ int mib[3];
-+ int error;
-+ int cnt;
-+ size_t len;
-+ char *buf, *bp, *eb;
-+ struct kinfo_proc *kip, *kp, *ki;
-+
-+ *cntp = 0;
-+
-+ len = 0;
-+ mib[0] = CTL_KERN;
-+ mib[1] = KERN_PROC;
-+ mib[2] = KERN_PROC_PROC;
-+
-+ error = sysctl(mib, 3, NULL, &len, NULL, 0);
-+ if (error)
-+ return NULL;
-+
-+ len = len * 4 / 3;
-+ buf = (char *) g_malloc(len);
-+ if (buf == NULL)
-+ return NULL;
-+
-+ error = sysctl(mib, 3, buf, &len, NULL, 0);
-+ if (error)
-+ {
-+ g_free(buf);
-+ return NULL;
-+ }
-+
-+ cnt = 0;
-+ bp = buf;
-+ eb = buf + len;
-+ while (bp < eb)
-+ {
-+ ki = (struct kinfo_proc *) (uintptr_t) bp;
-+ bp += ki->ki_structsize;
-+ cnt++;
-+ }
-+
-+ kip = calloc(cnt, sizeof (*kip));
-+ if (kip == NULL)
-+ {
-+ g_free(buf);
-+ return NULL;
-+ }
-+
-+ bp = buf;
-+ eb = buf + len;
-+ kp = kip;
-+ while (bp < eb)
-+ {
-+ ki = (struct kinfo_proc *) (uintptr_t) bp;
-+ memcpy(kp, ki, ki->ki_structsize);
-+ bp += ki->ki_structsize;
-+ kp->ki_structsize = sizeof(*kp);
-+ kp++;
-+ }
-+
-+ g_free(buf);
-+ *cntp = cnt;
-+ return kip;
-+}
-+
-+static gboolean
-+device_opened_by_proc (const char *device, const char *proc, pid_t *pid)
-+{
-+ struct kinfo_proc *kip, *pfreep;
-+ int cnt, i;
-+
-+ *pid = NO_PID;
-+
-+ pfreep = hfp_kinfo_getproc(&cnt);
-+ if (pfreep == NULL)
-+ return FALSE;
-+
-+ for (i = 0; i < cnt; i++)
-+ {
-+ kip = &pfreep[i];
-+
-+ if (! strcmp(kip->ki_comm, proc))
-+ {
-+ struct kinfo_file *kif, *ffreep;
-+ int fcnt, j;
-+
-+ ffreep = kinfo_getfile(kip->ki_pid, &fcnt);
-+ if (ffreep == NULL)
-+ continue;
-+ for (j = 0; j < fcnt; j++)
-+ {
-+ kif = &ffreep[j];
-+
-+ if (kif->kf_type == KF_TYPE_VNODE &&
-+ ! strcmp(kif->kf_path, device))
-+ {
-+ *pid = kip->ki_pid;
-+ g_free(ffreep);
-+ g_free(pfreep);
-+ return TRUE;
-+ }
-+ }
-+ g_free(ffreep);
-+ }
-+ }
-+ g_free(pfreep);
-+
-+ return FALSE;
-+}
-+#else
-+static gboolean
-+device_opened_by_proc (const char *device, const char *proc, pid_t *pid)
-+{
-+ char **lines;
-+ char *output = NULL;
-+ char *cmd;
-+ int i;
-+ gboolean found = FALSE;
-+
-+ cmd = g_strdup_printf(CMD, device);
-+ *pid = NO_PID;
-+
-+ if (! g_spawn_command_line_sync(cmd, &output, NULL, NULL, NULL))
-+ {
-+ g_free(cmd);
-+ goto done;
-+ }
-+ g_free(cmd);
-+
-+ if (! output || strlen(output) == 0)
-+ goto done;
-+
-+ lines = g_strsplit(output, "\n", 0);
-+ if (g_strv_length(lines) < 2)
-+ {
-+ g_strfreev(lines);
-+ goto done;
-+ }
-+
-+ for (i = 1; lines[i]; i++)
-+ {
-+ char **fields;
-+ guint len;
-+ guint j;
-+
-+ fields = g_strsplit_set(lines[i], " ", 0);
-+ len = g_strv_length(fields);
-+ if (len < 3)
-+ {
-+ g_strfreev(fields);
-+ continue;
-+ }
-+ for (j = 1; j < len && fields[j] && *fields[j] == '\0'; j++)
-+ ;
-+ if (j < len && fields[j] && ! strcmp(fields[j], proc))
-+ {
-+ found = TRUE;
-+ for (++j; j < len && fields[j] && *fields[j] == '\0'; j++)
-+ ;
-+ if (j < len && fields[j])
-+ *pid = atoi(fields[j]);
-+ g_strfreev(fields);
-+ break;
-+ }
-+ g_strfreev(fields);
-+ }
-+
-+ g_strfreev(lines);
-+
-+done:
-+ g_free(output);
-+
-+ return found;
-+}
-+#endif
-+
-+static const char *
-+get_mouse_device (const char *device, pid_t *pid)
-+{
-+ if (device_opened_by_proc(device, MOUSED_PROC_NAME, pid))
-+ return MOUSED_DEVICE;
-+
-+ return device;
-+}
-+
-+static void
-+poll_for_moused (void)
-+{
-+ struct kevent ev;
-+ const char *device;
-+ gboolean found;
-+ pid_t pid;
-+ char *owner = NULL;
-+ char *prev_owner = NULL;
-+
-+again:
-+ device = get_mouse_device(addon.device_file, &pid);
-+ if (pid != NO_PID)
-+ {
-+ EV_SET(&ev, pid, EVFILT_PROC, EV_ADD | EV_ENABLE, NOTE_EXIT, 0, NULL);
-+ if (kevent(kd, &ev, 1, NULL, 0, NULL) < 0)
-+ return;
-+ g_free(owner);
-+ owner = g_strdup(MOUSED_PROC_NAME);
-+ }
-+ else
-+ {
-+ found = device_opened_by_proc(device, XORG_PROC_NAME, &pid);
-+ if (found && pid != NO_PID)
-+ {
-+ EV_SET(&ev, pid, EVFILT_PROC, EV_ADD | EV_ENABLE, NOTE_EXIT, 0, NULL);
-+ if (kevent(kd, &ev, 1, NULL, 0, NULL) < 0)
-+ return;
-+ g_free(owner);
-+ owner = g_strdup(XORG_PROC_NAME);
-+ }
-+ else
-+ goto out;
-+ }
-+
-+ if (owner && prev_owner && strcmp(owner, prev_owner))
-+ goto out;
-+
-+ if (kevent(kd, NULL, 0, &ev, 1, NULL) < 0)
-+ return;
-+
-+ sleep(3);
-+ g_free(prev_owner);
-+ prev_owner = NULL;
-+ if (owner)
-+ prev_owner = g_strdup(owner);
-+ goto again;
-+
-+out:
-+ if (owner)
-+ {
-+ libhal_device_reprobe(hfp_ctx, hfp_udi, &hfp_error);
-+ dbus_error_free(&hfp_error);
-+ }
-+ g_free(owner);
-+ g_free(prev_owner);
-+}
-+
-+int
-+main (int argc, char **argv)
-+{
-+ DBusConnection *connection;
-+
-+ if (! hfp_init(argc, argv))
-+ goto end;
-+
-+ addon.device_file = getenv("HAL_PROP_FREEBSD_DEVICE_FILE");
-+ if (! addon.device_file)
-+ goto end;
-+
-+ setproctitle("%s", addon.device_file);
-+
-+ 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);
-+
-+ kd = kqueue();
-+ assert(kd > -1);
-+
-+ while (TRUE)
-+ {
-+ /* process dbus traffic until update interval has elapsed */
-+ while (TRUE)
-+ {
-+ struct timespec now;
-+
-+ hfp_clock_gettime(&now);
-+ if (hfp_timespeccmp(&now, &addon.next_update, <))
-+ {
-+ struct timespec timeout;
-+
-+ timeout = addon.next_update;
-+ hfp_timespecsub(&timeout, &now);
-+
-+ if (timeout.tv_sec < 0) /* current time went backwards */
-+ timeout = addon.update_interval;
-+
-+ dbus_connection_read_write_dispatch(connection, timeout.tv_sec * 1000 + timeout.tv_nsec / 1000000);
-+ if (! dbus_connection_get_is_connected(connection))
-+ goto end;
-+ }
-+ else
-+ break;
-+ }
-+
-+ poll_for_moused();
-+
-+ hfp_clock_gettime(&addon.next_update);
-+ hfp_timespecadd(&addon.next_update, &addon.update_interval);
-+ }
-+
-+ end:
-+ return 0;
-+}
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 f19b7e92d..000000000
--- a/sysutils/hal/files/patch-hald_freebsd_addons_addon-storage.c
+++ /dev/null
@@ -1,371 +0,0 @@
---- hald/freebsd/addons/addon-storage.c.orig 2008-08-10 09:50:10.000000000 -0400
-+++ hald/freebsd/addons/addon-storage.c 2009-09-13 17:23:52.000000000 -0400
-@@ -36,17 +36,24 @@
- #include "../libprobe/hfp.h"
- #include "../libprobe/hfp-cdrom.h"
-
-+static boolean is_locked_by_hal = FALSE;
-+static boolean check_lock_state = TRUE;
-+static boolean polling_disabled = FALSE;
-+
- static struct
- {
-- const struct timeval update_interval;
-+ const struct timespec update_interval;
- char *device_file;
- char *parent;
- boolean is_cdrom;
- boolean is_scsi_removable;
- boolean had_media;
-- struct timeval next_update;
-+ struct timespec next_update;
- } addon = { { 2, 0 } };
-
-+static void update_proc_title (const char *device);
-+static void unmount_volumes (void);
-+
- /* see MMC-3 Working Draft Revision 10 */
- static boolean
- hf_addon_storage_cdrom_eject_pressed (HFPCDROM *cdrom)
-@@ -100,8 +107,7 @@ hf_addon_storage_update (void)
-
- if (hf_addon_storage_cdrom_eject_pressed(cdrom))
- {
-- libhal_device_emit_condition(hfp_ctx, hfp_udi, "EjectPressed", "", &hfp_error);
-- dbus_error_free(&hfp_error);
-+ libhal_device_emit_condition(hfp_ctx, hfp_udi, "EjectPressed", "", NULL);
- }
-
- hfp_cdrom_free(cdrom);
-@@ -144,18 +150,142 @@ hf_addon_storage_update (void)
- }
- }
-
-- hfp_gettimeofday(&addon.next_update);
-- hfp_timevaladd(&addon.next_update, &addon.update_interval);
--
- return has_media;
- }
-
-+static void
-+unmount_volumes (void)
-+{
-+ int num_volumes;
-+ char **volumes;
-+
-+ if ((volumes = libhal_manager_find_device_string_match(hfp_ctx,
-+ "block.storage_device",
-+ hfp_udi,
-+ &num_volumes,
-+ NULL)) != NULL)
-+ {
-+ int i;
-+
-+ for (i = 0; i < num_volumes; i++)
-+ {
-+ char *vol_udi;
-+
-+ vol_udi = volumes[i];
-+
-+ if (libhal_device_get_property_bool(hfp_ctx, vol_udi, "volume.is_mounted", NULL))
-+ {
-+ DBusMessage *msg = NULL;
-+ DBusMessage *reply = NULL;
-+ DBusConnection *dbus_connection;
-+ unsigned int num_options = 0;
-+ char **options = NULL;
-+ char *devfile;
-+
-+ hfp_info("Forcing unmount of volume '%s'", vol_udi);
-+
-+ dbus_connection = libhal_ctx_get_dbus_connection(hfp_ctx);
-+ msg = dbus_message_new_method_call("org.freedesktop.Hal", vol_udi,
-+ "org.freedesktop.Hal.Device.Volume",
-+ "Unmount");
-+ if (msg == NULL)
-+ {
-+ hfp_warning("Could not create dbus message for %s", vol_udi);
-+ continue;
-+ }
-+
-+ options = calloc(1, sizeof (char *));
-+ if (options == NULL)
-+ {
-+ hfp_warning("Could not allocation memory for options");
-+ dbus_message_unref(msg);
-+ continue;
-+ }
-+
-+ options[0] = "force";
-+ num_options = 1;
-+
-+ devfile = libhal_device_get_property_string(hfp_ctx, vol_udi, "block.device", NULL);
-+ if (devfile != NULL)
-+ {
-+ hfp_info("Forcibly attempting to unmount %s as media was removed", devfile);
-+ libhal_free_string(devfile);
-+ }
-+
-+ if (! dbus_message_append_args(msg, DBUS_TYPE_ARRAY, DBUS_TYPE_STRING, &options, num_options, DBUS_TYPE_INVALID))
-+ {
-+ hfp_warning("Could not append args to dbus message for %s", vol_udi);
-+ free(options);
-+ dbus_message_unref(msg);
-+ continue;
-+ }
-+
-+ if (! (reply = dbus_connection_send_with_reply_and_block(dbus_connection, msg, -1, &hfp_error)))
-+ {
-+ hfp_warning("Unmount failed for %s: %s: %s", vol_udi, hfp_error.name, hfp_error.message);
-+ dbus_error_free(&hfp_error);
-+ free(options);
-+ dbus_message_unref(msg);
-+ continue;
-+ }
-+
-+ if (dbus_error_is_set(&hfp_error))
-+ {
-+ hfp_warning("Unmount failed for %s: %s : %s", vol_udi, hfp_error.name, hfp_error.message);
-+ dbus_error_free(&hfp_error);
-+ free(options);
-+ dbus_message_unref(msg);
-+ dbus_message_unref(reply);
-+ continue;
-+ }
-+
-+ hfp_info("Successfully unmounted udi '%s'", vol_udi);
-+ free(options);
-+ dbus_message_unref(msg);
-+ dbus_message_unref(reply);
-+ }
-+ }
-+ libhal_free_string_array(volumes);
-+ }
-+}
-+
- static boolean
--poll_for_media (void)
-+poll_for_media (boolean check_only, boolean force)
- {
- boolean has_media;
-
-+ if (check_lock_state)
-+ {
-+ boolean should_poll;
-+
-+ check_lock_state = FALSE;
-+
-+ hfp_info("Checking whether device %s is locked by HAL", addon.device_file);
-+ if (libhal_device_is_locked_by_others(hfp_ctx, hfp_udi, "org.freedesktop.Hal.Device.Storage", NULL))
-+ {
-+ hfp_info("... device %s is locked by HAL", addon.device_file);
-+ is_locked_by_hal = TRUE;
-+ update_proc_title(addon.device_file);
-+ goto skip_check;
-+ }
-+ else
-+ {
-+ hfp_info("... device %s is not locked by HAL", addon.device_file);
-+ is_locked_by_hal = FALSE;
-+ }
-+
-+ should_poll = libhal_device_get_property_bool(hfp_ctx, hfp_udi, "storage.media_check_enabled", NULL);
-+ polling_disabled = ! should_poll;
-+ update_proc_title(addon.device_file);
-+ }
-+
-+ if (! force && polling_disabled)
-+ goto skip_check;
-+
- has_media = hf_addon_storage_update();
-+ if (check_only)
-+ return has_media;
-+
- if (has_media != addon.had_media)
- {
- /*
-@@ -168,27 +298,47 @@ poll_for_media (void)
- * then hung while rebooting and did not unmount my other
- * filesystems.
- */
-+#if __FreeBSD_version >= 800066
-+ /*
-+ * With newusb, it is safe to force unmount volumes. This may be
-+ * safe on newer versions of the old USB stack, but we'll be
-+ * extra cautious.
-+ */
-+ unmount_volumes();
-+#endif
-
-- libhal_device_rescan(hfp_ctx, hfp_udi, &hfp_error);
-- dbus_error_free(&hfp_error);
-+ libhal_device_rescan(hfp_ctx, hfp_udi, NULL);
- addon.had_media = has_media;
-
- return TRUE;
- }
-+
-+skip_check:
-+
- return FALSE;
- }
-
- static void
--update_proc_title (const char *device, boolean polling_enabled)
-+update_proc_title (const char *device)
- {
-- if (polling_enabled)
-- setproctitle("%s", device);
-- else
-+ if (polling_disabled)
- setproctitle("no polling on %s because it is explicitly disabled", device);
-+ else if (is_locked_by_hal)
-+ setproctitle("no polling on %s because it is locked by HAL", device);
-+ else
-+ setproctitle("%s", device);
- }
-
- static DBusHandlerResult
--filter_function (DBusConnection *connection, DBusMessage *message, void *user_data)
-+dbus_filter_function (DBusConnection *connection, DBusMessage *message, void *user_data)
-+{
-+ check_lock_state = TRUE;
-+
-+ return DBUS_HANDLER_RESULT_HANDLED;
-+}
-+
-+static DBusHandlerResult
-+direct_filter_function (DBusConnection *connection, DBusMessage *message, void *user_data)
- {
- if (dbus_message_is_method_call(message,
- "org.freedesktop.Hal.Device.Storage.Removable",
-@@ -199,7 +349,7 @@ filter_function (DBusConnection *connect
-
- hfp_info("Forcing poll for media becusse CheckForMedia() was called");
-
-- had_effect = poll_for_media();
-+ had_effect = poll_for_media(FALSE, TRUE);
-
- reply = dbus_message_new_method_return (message);
- dbus_message_append_args(reply, DBUS_TYPE_BOOLEAN, &had_effect, DBUS_TYPE_INVALID);
-@@ -217,8 +367,9 @@ main (int argc, char **argv)
- char *removable;
- char *bus;
- char *driver;
-- boolean should_poll;
-+ char *filter_str;
- DBusConnection *connection;
-+ DBusConnection *syscon;
-
- if (! hfp_init(argc, argv))
- goto end;
-@@ -251,16 +402,39 @@ main (int argc, char **argv)
- addon.is_scsi_removable = (! strcmp(bus, "scsi") ||
- (! strcmp(bus, "usb") && (! strcmp(driver, "da") || ! strcmp(driver, "sa") ||
- ! strcmp(driver, "cd")))) && ! strcmp(removable, "true");
-- addon.had_media = hf_addon_storage_update();
-+ addon.had_media = poll_for_media(TRUE, FALSE);
-
-- if (! libhal_device_addon_is_ready(hfp_ctx, hfp_udi, &hfp_error))
-+ if (! libhal_device_addon_is_ready(hfp_ctx, hfp_udi, NULL))
- goto end;
-- dbus_error_free(&hfp_error);
-+
-+ syscon = dbus_bus_get(DBUS_BUS_SYSTEM, NULL);
-+ assert(syscon != NULL);
-+ dbus_connection_set_exit_on_disconnect(syscon, 0);
-+
-+ dbus_bus_add_match(syscon,
-+ "type='signal'"
-+ ",interface='org.freedesktop.Hal.Manager'"
-+ ",sender='org.freedesktop.Hal'",
-+ NULL);
-+ dbus_bus_add_match(syscon,
-+ "type='signal'"
-+ ",interface='org.freedesktop.Hal.Manager'"
-+ ",sender='org.freedesktop.Hal'",
-+ NULL);
-+ filter_str = hfp_strdup_printf("type='signal'"
-+ ",interface='org.freedesktop.Hal.Device'"
-+ ",sender='org.freedesktop.Hal'"
-+ ",path='%s'",
-+ hfp_udi);
-+ dbus_bus_add_match(syscon, filter_str, NULL);
-+ hfp_free(filter_str);
-+
-+ dbus_connection_add_filter(syscon, dbus_filter_function, NULL, NULL);
-
- 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);
-+ dbus_connection_add_filter(connection, direct_filter_function, NULL, NULL);
-
- if (! libhal_device_claim_interface(hfp_ctx,
- hfp_udi,
-@@ -268,52 +442,43 @@ main (int argc, char **argv)
- " <method name=\"CheckForMedia\">\n"
- " <arg name=\"call_had_sideeffect\" direction=\"out\" type=\"b\"/>\n"
- " </method>\n",
-- &hfp_error))
-+ NULL))
- {
- 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)
- {
-- struct timeval now;
-+ struct timespec now;
-
-- hfp_gettimeofday(&now);
-- if (hfp_timevalcmp(&now, &addon.next_update, <))
-+ hfp_clock_gettime(&now);
-+ if (hfp_timespeccmp(&now, &addon.next_update, <))
- {
-- struct timeval timeout;
-+ struct timespec timeout;
-
- timeout = addon.next_update;
-- hfp_timevalsub(&timeout, &now);
-+ hfp_timespecsub(&timeout, &now);
-
- if (timeout.tv_sec < 0) /* current time went backwards */
- timeout = addon.update_interval;
-
-- dbus_connection_read_write_dispatch(connection, timeout.tv_sec * 1000 + timeout.tv_usec / 1000);
-- if (! dbus_connection_get_is_connected(connection))
-+ dbus_connection_read_write_dispatch(connection, (int) ((timeout.tv_sec * 1000 + timeout.tv_nsec / 1000000) / 2));
-+ dbus_connection_read_write_dispatch(syscon, (int) ((timeout.tv_sec * 1000 + timeout.tv_nsec / 1000000) / 2));
-+ if (! dbus_connection_get_is_connected(connection) ||
-+ ! dbus_connection_get_is_connected(syscon))
- goto end;
- }
- else
- break;
- }
-
-- should_poll = libhal_device_get_property_bool(hfp_ctx, hfp_udi, "storage.media_check_enabled", &hfp_error);
-- dbus_error_free(&hfp_error);
-- update_proc_title(addon.device_file, should_poll);
--
-- if (should_poll)
-- {
-- poll_for_media();
-- }
-- else
-- {
-- hfp_gettimeofday(&addon.next_update);
-- hfp_timevaladd(&addon.next_update, &addon.update_interval);
-- }
-+ poll_for_media(FALSE, FALSE);
-+ hfp_clock_gettime(&addon.next_update);
-+ hfp_timespecadd(&addon.next_update, &addon.update_interval);
- }
-
- end:
diff --git a/sysutils/hal/files/patch-hald_freebsd_clock b/sysutils/hal/files/patch-hald_freebsd_clock
deleted file mode 100644
index 488283e02..000000000
--- a/sysutils/hal/files/patch-hald_freebsd_clock
+++ /dev/null
@@ -1,111 +0,0 @@
---- hald/freebsd/libprobe/hfp.c.orig 2008-03-17 17:25:17.000000000 -0400
-+++ hald/freebsd/libprobe/hfp.c 2008-03-26 12:07:32.000000000 -0400
-@@ -216,55 +216,59 @@ hfp_getenv_bool (const char *variable)
- }
-
- void
--hfp_gettimeofday (struct timeval *t)
-+hfp_clock_gettime (struct timespec *t)
- {
- int status;
-
- assert(t != NULL);
-
-- status = gettimeofday(t, NULL);
-+#ifdef CLOCK_MONOTONIC_FAST
-+ status = clock_gettime(CLOCK_MONOTONIC_FAST, t);
-+#else
-+ status = clock_gettime(CLOCK_MONOTONIC, t);
-+#endif
- assert(status == 0);
- }
-
--/* timeval functions from sys/kern/kern_time.c */
-+/* timespec functions from sys/kern/kern_time.c */
-
- static void
--hfp_timevalfix (struct timeval *t)
-+hfp_timespecfix (struct timespec *t)
- {
- assert(t != NULL);
-
-- if (t->tv_usec < 0)
-+ if (t->tv_nsec < 0)
- {
- t->tv_sec--;
-- t->tv_usec += 1000000;
-+ t->tv_nsec += 1000000000;
- }
-- if (t->tv_usec >= 1000000)
-+ if (t->tv_nsec >= 1000000000)
- {
- t->tv_sec++;
-- t->tv_usec -= 1000000;
-+ t->tv_nsec -= 1000000000;
- }
- }
-
- void
--hfp_timevaladd (struct timeval *t1, const struct timeval *t2)
-+hfp_timespecadd (struct timespec *t1, const struct timespec *t2)
- {
- assert(t1 != NULL);
- assert(t2 != NULL);
-
- t1->tv_sec += t2->tv_sec;
-- t1->tv_usec += t2->tv_usec;
-+ t1->tv_nsec += t2->tv_nsec;
-
-- hfp_timevalfix(t1);
-+ hfp_timespecfix(t1);
- }
-
- void
--hfp_timevalsub (struct timeval *t1, const struct timeval *t2)
-+hfp_timespecsub (struct timespec *t1, const struct timespec *t2)
- {
- assert(t1 != NULL);
- assert(t2 != NULL);
-
- t1->tv_sec -= t2->tv_sec;
-- t1->tv_usec -= t2->tv_usec;
-+ t1->tv_nsec -= t2->tv_nsec;
-
-- hfp_timevalfix(t1);
-+ hfp_timespecfix(t1);
- }
---- hald/freebsd/libprobe/hfp.h.orig 2008-03-17 17:25:17.000000000 -0400
-+++ hald/freebsd/libprobe/hfp.h 2008-04-02 14:35:50.000000000 -0400
-@@ -29,8 +29,12 @@
- #endif
-
- #include <stdarg.h>
-+#include <time.h>
- #include <sys/types.h>
-+#include <sys/param.h>
-+#if __FreeBSD_version < 600000
- #include <sys/time.h>
-+#endif
-
- #include "libhal/libhal.h"
-
-@@ -84,14 +88,14 @@ void volume_id_log (const char *format,
-
- boolean hfp_getenv_bool (const char *variable);
-
--void hfp_gettimeofday (struct timeval *t);
--void hfp_timevaladd (struct timeval *t1, const struct timeval *t2);
--void hfp_timevalsub (struct timeval *t1, const struct timeval *t2);
-+void hfp_clock_gettime (struct timespec *t);
-+void hfp_timespecadd (struct timespec *t1, const struct timespec *t2);
-+void hfp_timespecsub (struct timespec *t1, const struct timespec *t2);
-
- /* from sys/time.h (_KERNEL) */
--#define hfp_timevalcmp(t1, t2, cmp) \
-+#define hfp_timespeccmp(t1, t2, cmp) \
- (((t1)->tv_sec == (t2)->tv_sec \
-- ? ((t1)->tv_usec cmp (t2)->tv_usec) \
-+ ? ((t1)->tv_nsec cmp (t2)->tv_nsec) \
- : ((t1)->tv_sec cmp (t2)->tv_sec)))
-
- #endif /* _HFP_H */
diff --git a/sysutils/hal/files/patch-hald_freebsd_hf-acpi.c b/sysutils/hal/files/patch-hald_freebsd_hf-acpi.c
deleted file mode 100644
index a21095a5f..000000000
--- a/sysutils/hal/files/patch-hald_freebsd_hf-acpi.c
+++ /dev/null
@@ -1,90 +0,0 @@
---- hald/freebsd/hf-acpi.c.orig 2008-05-07 19:23:59.000000000 -0400
-+++ hald/freebsd/hf-acpi.c 2009-02-04 11:32:27.000000000 -0500
-@@ -54,6 +54,7 @@
- static const struct laptop_panel_type {
- char *access;
- char *name;
-+ char *get_sysctl;
- char *max_sysctl;
- int max_levels;
- #define HF_ACPI_IBM_MAX_LEVELS 8
-@@ -64,17 +65,29 @@
- #define HF_ACPI_FUJITSU_MAX_LEVELS 8
- /* NOTE: Each new type must also be added to hf-devtree.c */
- } laptop_panel_types[] = {
-- { "ibm", "IBM", NULL,
-+ { "ibm", "IBM",
-+ "dev.acpi_ibm.0.lcd_brightness",
-+ NULL,
- HF_ACPI_IBM_MAX_LEVELS },
-- { "toshiba", "Toshiba", NULL,
-+ { "toshiba", "Toshiba",
-+ "hw.acpi.toshiba.lcd_brightness",
-+ NULL,
- HF_ACPI_TOSHIBA_MAX_LEVELS },
-- { "sony", "Sony", NULL,
-+ { "sony", "Sony",
-+ "dev.acpi_sony.0.brightness",
-+ NULL,
- HF_ACPI_SONY_MAX_LEVELS },
-- { "panasonic", "Panasonic", "hw.acpi.panasonic.lcd_brightness_max",
-+ { "panasonic", "Panasonic",
-+ "hw.acpi.panasonic.lcd_brightness",
-+ "hw.acpi.panasonic.lcd_brightness_max",
- HF_ACPI_PANASONIC_MAX_LEVELS },
-- { "asus", "Asus", NULL,
-+ { "asus", "Asus",
-+ "hw.acpi.asus.lcd_brightness",
-+ NULL,
- HF_ACPI_ASUS_MAX_LEVELS },
-- { "fujitsu", "Fujitsu", NULL,
-+ { "fujitsu", "Fujitsu",
-+ "hw.acpi.fujitsu.lcd_brightness",
-+ NULL,
- HF_ACPI_FUJITSU_MAX_LEVELS }
- };
-
-@@ -105,6 +118,9 @@
- gboolean ispresent;
- union acpi_battery_ioctl_arg battif, battst, battinfo;
-
-+ if (! hf_has_sysctl("hw.acpi.battery.units"))
-+ return;
-+
- battif.unit = battst.unit = battinfo.unit =
- hal_device_property_get_int(device, "freebsd.unit");
-
-@@ -497,13 +513,15 @@
-
- static HalDevice *
- hf_acpi_laptop_panel_new (HalDevice *parent, int max_levels,
-- const char *max_sysctl, const char *access,
-- const char *name)
-+ const char *get_sysctl, const char *max_sysctl,
-+ const char *access, const char *name)
- {
- HalDevice *device;
-
- g_return_val_if_fail(HAL_IS_DEVICE(parent), NULL);
-
-+ if (get_sysctl == NULL || ! hf_has_sysctl(get_sysctl))
-+ return NULL;
- device = hf_device_new(parent);
-
- hf_device_property_set_string_printf(device, "info.product", "Laptop Panel (%s)", name);
-@@ -593,11 +611,13 @@
- HalDevice *panel_device;
-
- panel_device = hf_acpi_laptop_panel_new(parent,
-- laptop_panel_types[i].max_levels,
-+ laptop_panel_types[i].max_levels,
-+ laptop_panel_types[i].get_sysctl,
- laptop_panel_types[i].max_sysctl,
- laptop_panel_types[i].access,
- laptop_panel_types[i].name);
-- hf_device_preprobe_and_add(panel_device);
-+ if (panel_device)
-+ hf_device_preprobe_and_add(panel_device);
- }
- }
- }
diff --git a/sysutils/hal/files/patch-hald_freebsd_hf-computer.c b/sysutils/hal/files/patch-hald_freebsd_hf-computer.c
deleted file mode 100644
index e2921c58a..000000000
--- a/sysutils/hal/files/patch-hald_freebsd_hf-computer.c
+++ /dev/null
@@ -1,26 +0,0 @@
---- hald/freebsd/hf-computer.c.orig 2009-07-18 21:22:48.000000000 -0400
-+++ hald/freebsd/hf-computer.c 2009-07-18 21:23:51.000000000 -0400
-@@ -26,6 +26,7 @@
- # include <config.h>
- #endif
-
-+#include <stdio.h>
- #include <string.h>
- #include <sys/utsname.h>
-
-@@ -133,11 +134,11 @@ hf_computer_device_add (void)
- if (PACKAGE_VERSION) {
- int major, minor, micro;
-
-- hal_device_property_set_string (root, "org.freedesktop.Hal.version", PACKAGE_VERSION);
-+ hal_device_property_set_string (device, "org.freedesktop.Hal.version", PACKAGE_VERSION);
- if ( sscanf( PACKAGE_VERSION, "%d.%d.%d", &major, &minor, &micro ) == 3 ) {
-- hal_device_property_set_int (root, "org.freedesktop.Hal.version.major", major);
-- hal_device_property_set_int (root, "org.freedesktop.Hal.version.minor", minor);
-- hal_device_property_set_int (root, "org.freedesktop.Hal.version.micro", micro);
-+ hal_device_property_set_int (device, "org.freedesktop.Hal.version.major", major);
-+ hal_device_property_set_int (device, "org.freedesktop.Hal.version.minor", minor);
-+ hal_device_property_set_int (device, "org.freedesktop.Hal.version.micro", micro);
- }
- }
-
diff --git a/sysutils/hal/files/patch-hald_freebsd_hf-devd.c b/sysutils/hal/files/patch-hald_freebsd_hf-devd.c
deleted file mode 100644
index 29ed38a7e..000000000
--- a/sysutils/hal/files/patch-hald_freebsd_hf-devd.c
+++ /dev/null
@@ -1,56 +0,0 @@
---- hald/freebsd/hf-devd.c.orig 2008-05-07 19:23:59.000000000 -0400
-+++ hald/freebsd/hf-devd.c 2009-05-30 03:15:33.000000000 -0400
-@@ -28,6 +28,7 @@
- #include <string.h>
- #include <errno.h>
- #include <unistd.h>
-+#include <sys/param.h>
- #include <sys/types.h>
- #include <sys/socket.h>
- #include <sys/un.h>
-@@ -40,7 +41,11 @@
- #include "hf-acpi.h"
- #include "hf-net.h"
- #include "hf-pcmcia.h"
-+#include "hf-storage.h"
- #include "hf-usb.h"
-+#ifdef HAVE_LIBUSB20
-+#include "hf-usb2.h"
-+#endif
- #include "hf-util.h"
-
- #define HF_DEVD_SOCK_PATH "/var/run/devd.pipe"
-@@ -51,10 +56,16 @@
- #define HF_DEVD_EVENT_NOMATCH '?'
-
- static HFDevdHandler *handlers[] = {
-+#ifdef HAVE_LIBUSB20
-+ &hf_usb2_devd_handler,
-+#endif
-+#if __FreeBSD_version < 800092
- &hf_usb_devd_handler,
-+#endif
- &hf_net_devd_handler,
- &hf_acpi_devd_handler,
-- &hf_pcmcia_devd_handler
-+ &hf_pcmcia_devd_handler,
-+ &hf_storage_devd_handler
- };
-
- static gboolean hf_devd_inited = FALSE;
-@@ -381,13 +392,13 @@ hf_devd_event_cb (GIOChannel *source, GI
-
- status = g_io_channel_read_line(source, &event, NULL, &terminator, NULL);
-
-- if (status != G_IO_STATUS_NORMAL)
-+ if (status == G_IO_STATUS_NORMAL)
- {
- event[terminator] = 0;
- hf_devd_process_event(event);
- g_free(event);
- }
-- else if (status != G_IO_STATUS_AGAIN)
-+ else if (status == G_IO_STATUS_AGAIN)
- {
- hf_devd_init();
- if (hf_devd_inited)
diff --git a/sysutils/hal/files/patch-hald_freebsd_hf-devtree.c b/sysutils/hal/files/patch-hald_freebsd_hf-devtree.c
deleted file mode 100644
index afc07d63a..000000000
--- a/sysutils/hal/files/patch-hald_freebsd_hf-devtree.c
+++ /dev/null
@@ -1,77 +0,0 @@
---- hald/freebsd/hf-devtree.c.orig 2008-05-07 19:24:03.000000000 -0400
-+++ hald/freebsd/hf-devtree.c 2009-02-16 18:48:41.000000000 -0500
-@@ -86,7 +86,11 @@ hf_devtree_cpu_can_throttle (int cpu)
- gboolean can = FALSE;
- char *levels;
-
-+#ifdef notyet
- levels = hf_get_string_sysctl(NULL, "dev.cpu.%i.freq_levels", cpu);
-+#else
-+ levels = hf_get_string_sysctl(NULL, "dev.cpu.0.freq_levels");
-+#endif
- if (levels)
- {
- char **toks;
-@@ -109,7 +113,11 @@ hf_devtree_cpu_get_maxfreq (int cpu)
- char *levels;
- int freq = -1;
-
-+#ifdef notyet
- levels = hf_get_string_sysctl(NULL, "dev.cpu.%i.freq_levels", cpu);
-+#else
-+ levels = hf_get_string_sysctl(NULL, "dev.cpu.0.freq_levels");
-+#endif
- if (levels)
- {
- sscanf(levels, "%i/", &freq);
-@@ -379,7 +387,8 @@ static Handler handlers[] = {
- { "pcm", NULL },
- { "psm", hf_devtree_psm_set_properties },
- { "sio", NULL },
-- { "speaker", NULL }
-+ { "speaker", NULL },
-+ { "usbus", NULL }
- };
-
- static void
-@@ -426,7 +435,13 @@ hf_devtree_probe (void)
- HalDevice *device;
-
- device = hf_devtree_device_new(parent, info->handler, info->unit);
-- hf_device_preprobe_and_add(device);
-+ if (hf_device_preprobe(device))
-+ {
-+ if (hal_device_has_capability(device, "input.mouse"))
-+ hf_runner_run_sync(device, 0, "hald-probe-mouse", NULL);
-+
-+ hf_device_add(device);
-+ }
- }
-
- devices = g_slist_delete_link(devices, root);
-@@ -434,6 +449,17 @@ hf_devtree_probe (void)
- }
- }
-
-+static gboolean
-+hf_devtree_rescan (HalDevice *device)
-+{
-+ if (hal_device_has_capability(device, "input.mouse"))
-+ {
-+ hf_runner_run_sync(device, 0, "hald-probe-mouse", NULL);
-+ return TRUE;
-+ }
-+ return FALSE;
-+}
-+
- HalDevice *
- hf_devtree_find_from_name (HalDeviceStore *store, const char *name)
- {
-@@ -597,5 +623,6 @@ hf_devtree_is_driver (const char *name,
- }
-
- HFHandler hf_devtree_handler = {
-- .probe = hf_devtree_probe
-+ .probe = hf_devtree_probe,
-+ .device_rescan = hf_devtree_rescan
- };
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 bc7ad871d..000000000
--- a/sysutils/hal/files/patch-hald_freebsd_hf-scsi.c
+++ /dev/null
@@ -1,11 +0,0 @@
---- hald/freebsd/hf-scsi.c.orig 2009-08-18 16:19:02.000000000 -0400
-+++ hald/freebsd/hf-scsi.c 2009-08-18 16:19:24.000000000 -0400
-@@ -549,7 +549,7 @@ hf_scsi_probe (void)
- break; /* only use the first peripheral */
-
- match = &ccb.cdm.matches[i].result.periph_result;
-- if ((int) match->path_id == -1 || ! strcmp(match->periph_name, "pass"))
-+ if ((int) match->path_id == -1 || ! strcmp(match->periph_name, "pass") || ! strcmp(match->periph_name, "probe"))
- break;
-
- pending_devname = g_strdup_printf("%s%i", match->periph_name, match->unit_number);
diff --git a/sysutils/hal/files/patch-hald_freebsd_hf-storage.h b/sysutils/hal/files/patch-hald_freebsd_hf-storage.h
deleted file mode 100644
index ca673b5bc..000000000
--- a/sysutils/hal/files/patch-hald_freebsd_hf-storage.h
+++ /dev/null
@@ -1,13 +0,0 @@
---- hald/freebsd/hf-storage.h.orig 2009-02-23 01:43:49.000000000 -0500
-+++ hald/freebsd/hf-storage.h 2009-02-23 01:45:17.000000000 -0500
-@@ -29,8 +29,10 @@
- #endif
-
- #include "hf-osspec.h"
-+#include "hf-devd.h"
-
- extern HFHandler hf_storage_handler;
-+extern HFDevdHandler hf_storage_devd_handler;
-
- void hf_storage_device_enable (HalDevice *device);
- void hf_storage_device_enable_tape (HalDevice *device);
diff --git a/sysutils/hal/files/patch-hald_freebsd_hf-usb.c b/sysutils/hal/files/patch-hald_freebsd_hf-usb.c
deleted file mode 100644
index a3289fbab..000000000
--- a/sysutils/hal/files/patch-hald_freebsd_hf-usb.c
+++ /dev/null
@@ -1,178 +0,0 @@
---- hald/freebsd/hf-usb.c.orig 2008-05-07 19:24:02.000000000 -0400
-+++ hald/freebsd/hf-usb.c 2009-05-30 03:20:24.000000000 -0400
-@@ -25,13 +25,20 @@
- # include <config.h>
- #endif
-
-+#include <sys/param.h>
- #include <string.h>
- #include <errno.h>
- #include <stdlib.h>
- #include <fcntl.h>
- #include <sys/ioctl.h>
- #include <unistd.h>
-+#if __FreeBSD_version < 800092
-+#if __FreeBSD_version >= 800064
-+#include <legacy/dev/usb/usb.h>
-+#else
- #include <dev/usb/usb.h>
-+#endif
-+#endif
-
- #include "../logger.h"
- #include "../osspec.h"
-@@ -40,7 +47,13 @@
- #include "hf-devtree.h"
- #include "hf-util.h"
-
-+#if __FreeBSD_version < 800092
- #define HF_USB_DEVICE "/dev/usb"
-+#if __FreeBSD_version < 800066
-+#define HF_USB2_DEVICE "/dev/usb "
-+#else
-+#define HF_USB2_DEVICE "/dev/usbctl"
-+#endif
-
- typedef struct
- {
-@@ -227,51 +240,6 @@ hf_usb_get_full_config_descriptor (int f
- return NULL;
- }
-
--/*
-- * Adapted from usb_compute_udi() in linux2/physdev.c and
-- * usbclass_compute_udi() in linux2/classdev.c.
-- */
--static void
--hf_usb_device_compute_udi (HalDevice *device)
--{
-- g_return_if_fail(HAL_IS_DEVICE(device));
--
-- if (hal_device_has_capability(device, "hiddev"))
-- hf_device_set_full_udi(device, "%s_hiddev",
-- hal_device_property_get_string(device, "info.parent"));
-- else if (hal_device_has_capability(device, "video4linux"))
-- hf_device_set_full_udi(device, "%s_video4linux",
-- hal_device_property_get_string(device, "info.parent"));
-- else if (hal_device_has_property(device, "usb.interface.number"))
-- hf_device_set_full_udi(device, "%s_if%i",
-- hal_device_property_get_string(device, "info.parent"),
-- hal_device_property_get_int(device, "usb.interface.number"));
-- else
-- hf_device_set_udi(device, "usb_device_%x_%x_%s",
-- hal_device_property_get_int(device, "usb_device.vendor_id"),
-- hal_device_property_get_int(device, "usb_device.product_id"),
-- hal_device_has_property(device, "usb_device.serial")
-- ? hal_device_property_get_string(device, "usb_device.serial")
-- : "noserial");
--}
--
--static void
--hf_usb_add_webcam_properties (HalDevice *device)
--{
-- int unit;
--
-- g_return_if_fail(HAL_IS_DEVICE(device));
--
-- unit = hal_device_property_get_int(device, "freebsd.unit");
-- if (unit < 0)
-- unit = 0;
--
-- hal_device_property_set_string(device, "info.category", "video4linux");
-- hal_device_add_capability(device, "video4linux");
-- hf_device_property_set_string_printf(device, "video4linux.device", "/dev/video%i", unit);
-- hal_device_property_set_string(device, "info.product", "Video Device");
--}
--
- /* adapted from usbif_set_name() in linux2/physdev.c */
- static const char *
- hf_usb_get_interface_name (const usb_interface_descriptor_t *desc)
-@@ -424,7 +392,7 @@ hf_usb_device_new (HalDevice *parent,
- hf_devtree_device_set_name(device, di->udi_devnames[0]);
-
- if ((devname = hf_usb_get_devname(di, "ukbd"))) /* USB keyboard */
-- hf_device_set_input(device, "keyboard", devname);
-+ hf_device_set_input(device, "keyboard", NULL);
- else if ((devname = hf_usb_get_devname(di, "ums"))) /* USB mouse */
- hf_device_set_input(device, "mouse", devname);
- else if ((devname = hf_usb_get_devname(di, "uhid"))) /* UHID device */
-@@ -575,6 +543,8 @@ hf_usb_probe_device (HalDevice *parent,
- {
- if (hal_device_has_capability(device, "hiddev"))
- hf_runner_run_sync(device, 0, "hald-probe-hiddev", NULL);
-+ if (hal_device_has_capability(device, "input.mouse"))
-+ hf_runner_run_sync(device, 0, "hald-probe-mouse", NULL);
-
- hf_device_add(device);
- }
-@@ -633,9 +603,18 @@ hf_usb_privileged_init (void)
- {
- int i;
-
-+ if (g_file_test(HF_USB2_DEVICE, G_FILE_TEST_EXISTS))
-+ {
-+ hf_usb_fd = -1;
-+ return;
-+ }
-+
- hf_usb_fd = open(HF_USB_DEVICE, O_RDONLY);
- if (hf_usb_fd < 0)
-- HAL_INFO(("unable to open %s: %s", HF_USB_DEVICE, g_strerror(errno)));
-+ {
-+ HAL_INFO(("unable to open %s: %s", HF_USB_DEVICE, g_strerror(errno)));
-+ return;
-+ }
-
- for (i = 0; i < 16; i++)
- {
-@@ -885,3 +864,50 @@ HFDevdHandler hf_usb_devd_handler = {
- .add = hf_usb_devd_add,
- .remove = hf_usb_devd_remove
- };
-+#endif
-+
-+/*
-+ * Adapted from usb_compute_udi() in linux2/physdev.c and
-+ * usbclass_compute_udi() in linux2/classdev.c.
-+ */
-+void
-+hf_usb_device_compute_udi (HalDevice *device)
-+{
-+ g_return_if_fail(HAL_IS_DEVICE(device));
-+
-+ if (hal_device_has_capability(device, "hiddev"))
-+ hf_device_set_full_udi(device, "%s_hiddev",
-+ hal_device_property_get_string(device, "info.parent"));
-+ else if (hal_device_has_capability(device, "video4linux"))
-+ hf_device_set_full_udi(device, "%s_video4linux",
-+ hal_device_property_get_string(device, "info.parent"));
-+ else if (hal_device_has_property(device, "usb.interface.number"))
-+ hf_device_set_full_udi(device, "%s_if%i",
-+ hal_device_property_get_string(device, "info.parent"),
-+ hal_device_property_get_int(device, "usb.interface.number"));
-+ else
-+ hf_device_set_udi(device, "usb_device_%x_%x_%s",
-+ hal_device_property_get_int(device, "usb_device.vendor_id"),
-+ hal_device_property_get_int(device, "usb_device.product_id"),
-+ (hal_device_has_property(device, "usb_device.serial") &&
-+ strcmp(hal_device_property_get_string(device, "usb_device.serial"), ""))
-+ ? hal_device_property_get_string(device, "usb_device.serial")
-+ : "noserial");
-+}
-+
-+void
-+hf_usb_add_webcam_properties (HalDevice *device)
-+{
-+ int unit;
-+
-+ g_return_if_fail(HAL_IS_DEVICE(device));
-+
-+ unit = hal_device_property_get_int(device, "freebsd.unit");
-+ if (unit < 0)
-+ unit = 0;
-+
-+ hal_device_property_set_string(device, "info.category", "video4linux");
-+ hal_device_add_capability(device, "video4linux");
-+ hf_device_property_set_string_printf(device, "video4linux.device", "/dev/video%i", unit);
-+ hal_device_property_set_string(device, "info.product", "Video Device");
-+}
diff --git a/sysutils/hal/files/patch-hald_freebsd_hf-usb.h b/sysutils/hal/files/patch-hald_freebsd_hf-usb.h
deleted file mode 100644
index 32861e202..000000000
--- a/sysutils/hal/files/patch-hald_freebsd_hf-usb.h
+++ /dev/null
@@ -1,10 +0,0 @@
---- hald/freebsd/hf-usb.h.orig 2009-02-17 18:56:56.000000000 -0500
-+++ hald/freebsd/hf-usb.h 2009-02-17 18:57:21.000000000 -0500
-@@ -34,4 +34,7 @@
- extern HFHandler hf_usb_handler;
- extern HFDevdHandler hf_usb_devd_handler;
-
-+void hf_usb_device_compute_udi(HalDevice *device);
-+void hf_usb_add_webcam_properties(HalDevice *device);
-+
- #endif /* _HF_USB_H */
diff --git a/sysutils/hal/files/patch-hald_freebsd_hf-usb2.c b/sysutils/hal/files/patch-hald_freebsd_hf-usb2.c
deleted file mode 100644
index 9ba97b4e9..000000000
--- a/sysutils/hal/files/patch-hald_freebsd_hf-usb2.c
+++ /dev/null
@@ -1,315 +0,0 @@
---- hald/freebsd/hf-usb2.c.orig 2009-11-21 19:57:40.000000000 -0500
-+++ hald/freebsd/hf-usb2.c 2009-11-21 19:58:07.000000000 -0500
-@@ -0,0 +1,312 @@
-+/***************************************************************************
-+ * CVSID: $Id: patch-hald_freebsd_hf-usb2.c,v 1.4 2009-11-22 01:04:37 marcus Exp $
-+ *
-+ * hf-usb.c : USB support
-+ *
-+ * Copyright (C) 2009 Joe Marcus Clarke <marcus@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 <stdlib.h>
-+#include <unistd.h>
-+#include <libusb20.h>
-+
-+#include "../logger.h"
-+#include "../osspec.h"
-+
-+#include "hf-usb.h"
-+#include "hf-usb2.h"
-+#include "hf-devtree.h"
-+#include "hf-util.h"
-+
-+static struct libusb20_backend *hf_usb2_be = NULL;
-+
-+static void
-+hf_usb2_copy_parent (HalDevice *parent,
-+ const char *key,
-+ gpointer user_data)
-+{
-+ HalDevice *device;
-+
-+ g_return_if_fail(HAL_IS_DEVICE(parent));
-+ g_return_if_fail(HAL_IS_DEVICE(user_data));
-+
-+ device = HAL_DEVICE(user_data);
-+
-+ if (! strncmp(key, "usb_device.", strlen("usb_device.")))
-+ hal_device_copy_property(parent, key, device, key);
-+}
-+
-+static void
-+hf_usb2_probe_interfaces(HalDevice *parent)
-+{
-+ int num_interfaces;
-+ int i;
-+
-+ g_return_if_fail(HAL_IS_DEVICE(parent));
-+
-+ if (hal_device_property_get_bool(parent, "info.ignore"))
-+ return;
-+
-+ num_interfaces = hal_device_property_get_int(parent,
-+ "usb_device.num_interfaces");
-+
-+ for (i = 0; i < num_interfaces; i++)
-+ {
-+ HalDevice *device;
-+
-+ device = hf_device_new(parent);
-+
-+ hal_device_property_set_string(device, "info.subsystem", "usb");
-+ hal_device_property_set_int(device, "usb.interface.number", i);
-+ hal_device_property_foreach(parent, hf_usb2_copy_parent, device);
-+ hal_device_copy_property(parent, "info.product", device, "info.product");
-+ hal_device_copy_property(parent, "info.vendor", device, "info.vendor");
-+
-+ if (hf_device_preprobe(device))
-+ {
-+ const char *driver, *devname;
-+
-+ hf_runner_run_sync(device, 0, "hald-probe-usb2-interface", NULL);
-+
-+ devname = hal_device_property_get_string(device,
-+ "usb.freebsd.devname");
-+ if (devname)
-+ hf_devtree_device_set_name(device, devname);
-+
-+ driver = hal_device_property_get_string(device, "freebsd.driver");
-+ if (driver)
-+ {
-+ if (! strcmp(driver, "ukbd"))
-+ hf_device_set_input(device, "keyboard", NULL);
-+ else if (! strcmp(driver, "ums") || ! strcmp(driver, "atp"))
-+ {
-+ hf_device_set_input(device, "mouse", devname);
-+ hf_runner_run_sync(device, 0, "hald-probe-mouse", NULL);
-+ }
-+ else if (! strcmp(driver, "uhid"))
-+ {
-+ hal_device_property_set_string(device, "info.category",
-+ "hiddev");
-+ hal_device_add_capability(device, "hiddev");
-+ hf_device_property_set_string_printf(device, "hiddev.device",
-+ "/dev/%s", devname);
-+ hal_device_copy_property(device, "info.product", device,
-+ "hiddev.product");
-+ hf_runner_run_sync(device, 0, "hald-probe-hiddev", NULL);
-+ }
-+ else if (! strcmp(driver, "ldev"))
-+ {
-+ /* Linux driver (webcam) */
-+
-+ /*
-+ * XXX This is a hack. Currently, all ldev devices are
-+ * webcams. That may not always be the case. Hopefully,
-+ * when other Linux driver support is added, there will be
-+ * a sysctl or some other way to determine device class.
-+ */
-+ hf_usb_add_webcam_properties(device);
-+ }
-+ else if (! strcmp(driver, "pwc"))
-+ {
-+ /* Phillips Web Cam */
-+ hf_usb_add_webcam_properties(device);
-+ }
-+ }
-+
-+ hf_usb_device_compute_udi(device);
-+ hf_device_add(device);
-+ }
-+ }
-+}
-+
-+static void
-+hf_usb2_probe_device (HalDevice *parent, int bus, int addr)
-+{
-+ HalDevice *device;
-+
-+ g_return_if_fail(HAL_IS_DEVICE(parent));
-+
-+ device = hf_device_new(parent);
-+
-+ hal_device_property_set_string(device, "info.subsystem", "usb_device");
-+ hal_device_property_set_int(device, "usb_device.bus_number", bus);
-+ hal_device_property_set_int(device, "usb_device.level_number", addr - 1);
-+ hal_device_property_set_int(device, "usb_device.port_number", addr);
-+
-+ if (hf_device_preprobe(device))
-+ {
-+ hf_runner_run_sync(device, 0, "hald-probe-usb2-device", NULL);
-+ hf_usb_device_compute_udi(device);
-+
-+ hf_device_add(device);
-+ }
-+ else
-+ return;
-+
-+ hf_usb2_probe_interfaces(device);
-+}
-+
-+static void
-+hf_usb2_privileged_init (void)
-+{
-+ hf_usb2_be = libusb20_be_alloc_default();
-+ if (hf_usb2_be == NULL)
-+ HAL_INFO(("unable to open USB backend: %s", g_strerror(errno)));
-+}
-+
-+static void
-+hf_usb2_probe (void)
-+{
-+ struct libusb20_device *pdev = NULL;
-+
-+ if (hf_usb2_be == NULL)
-+ return;
-+
-+ while ((pdev = libusb20_be_device_foreach(hf_usb2_be, pdev)))
-+ {
-+ HalDevice *parent;
-+ int bus, addr;
-+
-+ bus = libusb20_dev_get_bus_number(pdev);
-+ addr = libusb20_dev_get_address(pdev);
-+
-+ if (addr == 1)
-+ parent = hf_devtree_find_from_info(hald_get_gdl(), "usbus", bus);
-+ else
-+ parent = hf_device_store_match(hald_get_gdl(), "usb_device.bus_number",
-+ HAL_PROPERTY_TYPE_INT32, bus, "usb_device.port_number",
-+ HAL_PROPERTY_TYPE_INT32, addr - 1, "info.bus",
-+ HAL_PROPERTY_TYPE_STRING, "usb_device", NULL);
-+ if (! parent || hal_device_property_get_bool(parent, "info.ignore"))
-+ continue;
-+
-+ hf_usb2_probe_device(parent, bus, addr);
-+ }
-+
-+ libusb20_be_free(hf_usb2_be);
-+ hf_usb2_be = NULL;
-+}
-+
-+static gboolean
-+hf_usb2_devd_add (const char *name,
-+ GHashTable *params,
-+ GHashTable *at,
-+ const char *parent)
-+{
-+ HalDevice *parent_device;
-+ int bus, addr, pbus, paddr;
-+
-+ if (! parent)
-+ return FALSE;
-+
-+ if (strncmp(name, "ugen", strlen("ugen")) &&
-+ ! strncmp(parent, "uhub", strlen("uhub")))
-+ return TRUE;
-+ else if (strncmp(name, "ugen", strlen("ugen")))
-+ return FALSE;
-+ else if (strncmp(parent, "ugen", strlen("ugen")))
-+ return TRUE;
-+
-+ if (sscanf(name, "ugen%i.%i", &bus, &addr) != 2)
-+ return FALSE;
-+
-+ if (sscanf(parent, "ugen%i.%i", &pbus, &paddr) != 2)
-+ return FALSE;
-+
-+ HAL_INFO(("received devd add event for device '%s' with parent '%s'",
-+ name, parent));
-+
-+ parent_device = hf_device_store_match(hald_get_gdl(),
-+ "usb_device.bus_number", HAL_PROPERTY_TYPE_INT32, pbus,
-+ "usb_device.port_number", HAL_PROPERTY_TYPE_INT32, paddr, "info.bus",
-+ HAL_PROPERTY_TYPE_STRING, "usb_device", NULL);
-+
-+ if (parent_device && ! hal_device_property_get_bool(parent_device,
-+ "info.ignore"))
-+ {
-+ hf_usb2_probe_device(parent_device, bus, addr);
-+ return TRUE;
-+ }
-+
-+ return FALSE;
-+}
-+
-+static gboolean
-+hf_usb2_devd_remove (const char *name,
-+ GHashTable *params,
-+ GHashTable *at,
-+ const char *parent)
-+{
-+ HalDevice *device;
-+ int bus, addr;
-+
-+ if (strncmp(name, "ugen", strlen("ugen")))
-+ return FALSE;
-+
-+ if (sscanf(name, "ugen%i.%i", &bus, &addr) != 2)
-+ return FALSE;
-+
-+ HAL_INFO(("received devd remove event, device %s", name));
-+
-+ device = hf_device_store_match(hald_get_gdl(), "usb_device.bus_number",
-+ HAL_PROPERTY_TYPE_INT32, bus, "usb_device.port_number",
-+ HAL_PROPERTY_TYPE_INT32, addr, "info.bus",
-+ HAL_PROPERTY_TYPE_STRING, "usb_device", NULL);
-+
-+ if (device)
-+ {
-+ hf_device_remove_tree(device);
-+ return TRUE;
-+ }
-+
-+ return FALSE;
-+}
-+
-+static gboolean
-+hf_usb2_devd_notify (const char *system,
-+ const char *subsystem,
-+ const char *type,
-+ const char *data)
-+{
-+ if (! data || strcmp(system, "DEVFS") || strcmp(subsystem, "CDEV") ||
-+ (strcmp(type, "CREATE") && strcmp(type, "DESTROY")))
-+ return FALSE;
-+
-+ if (! strncmp(data, "cdev=ugen", strlen("cdev=ugen")) ||
-+ ! strncmp(data, "cdev=usb", strlen("cdev=usb")))
-+ return TRUE;
-+
-+ return FALSE;
-+}
-+
-+HFHandler hf_usb2_handler = {
-+ .privileged_init = hf_usb2_privileged_init,
-+ .probe = hf_usb2_probe
-+};
-+
-+HFDevdHandler hf_usb2_devd_handler = {
-+ .add = hf_usb2_devd_add,
-+ .remove = hf_usb2_devd_remove,
-+ .notify = hf_usb2_devd_notify
-+};
diff --git a/sysutils/hal/files/patch-hald_freebsd_hf-usb2.h b/sysutils/hal/files/patch-hald_freebsd_hf-usb2.h
deleted file mode 100644
index ae3149585..000000000
--- a/sysutils/hal/files/patch-hald_freebsd_hf-usb2.h
+++ /dev/null
@@ -1,40 +0,0 @@
---- hald/freebsd/hf-usb2.h.orig 2009-02-18 00:22:59.000000000 -0500
-+++ hald/freebsd/hf-usb2.h 2009-02-18 00:22:54.000000000 -0500
-@@ -0,0 +1,37 @@
-+/***************************************************************************
-+ * CVSID: $Id: patch-hald_freebsd_hf-usb2.h,v 1.1 2009-05-17 05:02:48 marcus Exp $
-+ *
-+ * hf-usb.h : USB support
-+ *
-+ * Copyright (C) 2009 Joe Marcus Clarke <marcus@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 _HF_USB2_H
-+#define _HF_USB2_H
-+
-+#ifdef HAVE_CONFIG_H
-+# include <config.h>
-+#endif
-+
-+#include "hf-osspec.h"
-+#include "hf-devd.h"
-+
-+extern HFHandler hf_usb2_handler;
-+extern HFDevdHandler hf_usb2_devd_handler;
-+
-+#endif /* _HF_USB2_H */
diff --git a/sysutils/hal/files/patch-hald_freebsd_hf-volume.c b/sysutils/hal/files/patch-hald_freebsd_hf-volume.c
deleted file mode 100644
index 6ee93b139..000000000
--- a/sysutils/hal/files/patch-hald_freebsd_hf-volume.c
+++ /dev/null
@@ -1,105 +0,0 @@
---- hald/freebsd/hf-volume.c.orig 2008-08-10 09:50:10.000000000 -0400
-+++ hald/freebsd/hf-volume.c 2009-09-19 02:06:37.000000000 -0400
-@@ -45,6 +45,7 @@
- #include "hf-util.h"
-
- #define PROBE_VOLUME_TIMEOUT (HAL_HELPER_TIMEOUT * 6)
-+#define HF_VOLUME_FUSE_DB "/tmp/.fuse-mnts"
-
- static void
- hf_volume_get_mounts (struct statfs **mounts, int *n_mounts)
-@@ -60,6 +61,58 @@ hf_volume_get_mounts (struct statfs **mo
- }
- }
-
-+static char *
-+hf_volume_resolve_fuse (const char *special)
-+{
-+ gchar *contents;
-+ gchar **lines;
-+ gsize len;
-+ int i;
-+
-+ g_return_val_if_fail(special != NULL, NULL);
-+
-+ if (! g_file_get_contents(HF_VOLUME_FUSE_DB, &contents, &len, NULL))
-+ return g_strdup(special);
-+
-+ lines = g_strsplit(contents, "\n", 0);
-+ g_free(contents);
-+
-+ for (i = 0; lines && lines[i]; i++)
-+ {
-+ gchar **fields;
-+
-+ fields = g_strsplit(lines[i], "=", 2);
-+ if (fields && g_strv_length(fields) == 2)
-+ {
-+ if (strcmp(fields[0], special) == 0)
-+ {
-+ char *ret;
-+
-+ ret = g_strdup(fields[1]);
-+ g_strfreev(fields);
-+ g_strfreev(lines);
-+ return ret;
-+ }
-+ }
-+ g_strfreev(fields);
-+ }
-+
-+ g_strfreev(lines);
-+
-+ return g_strdup(special);
-+}
-+
-+static char *
-+hf_volume_resolve_special (const char *special)
-+{
-+ g_return_val_if_fail(special != NULL, NULL);
-+
-+ if (strstr(special, "fuse"))
-+ return hf_volume_resolve_fuse(special);
-+
-+ return g_strdup(special);
-+}
-+
- static const struct statfs *
- hf_volume_mounts_find (const struct statfs *mounts,
- int n_mounts,
-@@ -71,8 +124,18 @@ hf_volume_mounts_find (const struct stat
- g_return_val_if_fail(special != NULL, NULL);
-
- for (i = 0; i < n_mounts; i++)
-- if (! strcmp(mounts[i].f_mntfromname, special))
-- return &mounts[i];
-+ {
-+ char *resolved;
-+
-+ resolved = hf_volume_resolve_special(mounts[i].f_mntfromname);
-+ if (! strcmp(resolved, special))
-+ {
-+ g_free(resolved);
-+ return &mounts[i];
-+ }
-+
-+ g_free(resolved);
-+ }
-
- return NULL;
- }
-@@ -92,7 +155,13 @@ hf_volume_device_update_mount_properties
-
- special = hal_device_property_get_string(device, "block.device");
- if (special)
-- mount = hf_volume_mounts_find(mounts, n_mounts, special);
-+ {
-+ mount = hf_volume_mounts_find(mounts, n_mounts, special);
-+ if (mount && strcmp(special, mount->f_mntfromname))
-+ hal_device_property_set_string(device, "volume.freebsd.real_mounted_device", mount->f_mntfromname);
-+ else
-+ hal_device_property_remove(device, "volume.freebsd.real_mounted_device");
-+ }
- }
-
- hal_device_property_set_bool(device, "volume.is_mounted", mount != NULL);
diff --git a/sysutils/hal/files/patch-hald_freebsd_osspec.c b/sysutils/hal/files/patch-hald_freebsd_osspec.c
deleted file mode 100644
index ade6d2a73..000000000
--- a/sysutils/hal/files/patch-hald_freebsd_osspec.c
+++ /dev/null
@@ -1,32 +0,0 @@
---- hald/freebsd/osspec.c.orig 2008-05-07 19:24:01.000000000 -0400
-+++ hald/freebsd/osspec.c 2009-05-30 03:14:33.000000000 -0400
-@@ -25,6 +25,7 @@
- # include <config.h>
- #endif
-
-+#include <sys/param.h>
- #include <string.h>
-
- #include "../ids.h"
-@@ -46,13 +47,21 @@
- #include "hf-sound.h"
- #include "hf-storage.h"
- #include "hf-usb.h"
-+#ifdef HAVE_LIBUSB20
-+#include "hf-usb2.h"
-+#endif
- #include "hf-volume.h"
-
- /* the order matters: PCI devices must be created before their children, etc */
- static HFHandler *handlers[] = {
- &hf_pci_handler,
- &hf_devtree_handler,
-+#if __FreeBSD_version < 800092
- &hf_usb_handler,
-+#endif
-+#ifdef HAVE_LIBUSB20
-+ &hf_usb2_handler,
-+#endif
- &hf_ata_handler,
- &hf_scsi_handler,
- &hf_storage_handler,
diff --git a/sysutils/hal/files/patch-hald_freebsd_probing_Makefile.am b/sysutils/hal/files/patch-hald_freebsd_probing_Makefile.am
deleted file mode 100644
index 091af3c1c..000000000
--- a/sysutils/hal/files/patch-hald_freebsd_probing_Makefile.am
+++ /dev/null
@@ -1,57 +0,0 @@
---- hald/freebsd/probing/Makefile.am.orig 2008-08-10 09:50:10.000000000 -0400
-+++ hald/freebsd/probing/Makefile.am 2009-07-17 02:31:02.000000000 -0400
-@@ -9,11 +9,18 @@ AM_CPPFLAGS = \
-
- if HALD_COMPILE_FREEBSD
- libexec_PROGRAMS = \
-- hald-probe-hiddev \
-- hald-probe-scsi \
-- hald-probe-smbios \
-- hald-probe-storage \
-+ hald-probe-hiddev \
-+ hald-probe-mouse \
-+ hald-probe-scsi \
-+ hald-probe-smbios \
-+ hald-probe-storage \
- hald-probe-volume
-+
-+if HAVE_LIBUSB20
-+libexec_PROGRAMS += \
-+ hald-probe-usb2-device \
-+ hald-probe-usb2-interface
-+endif
- endif
-
- hald_probe_hiddev_SOURCES = probe-hiddev.c
-@@ -21,6 +28,25 @@ hald_probe_hiddev_LDADD = \
- $(top_builddir)/hald/freebsd/libprobe/libhald_freebsd_probe.la \
- -lusbhid
-
-+if HAVE_LIBUSB20
-+hald_probe_usb2_device_SOURCES = probe-usb2-device.c
-+hald_probe_usb2_device_LDADD = \
-+ $(top_builddir)/hald/freebsd/libprobe/libhald_freebsd_probe.la \
-+ @LIBUSB20_LIBS@
-+
-+hald_probe_usb2_interface_SOURCES = probe-usb2-interface.c
-+hald_probe_usb2_interface_LDADD = \
-+ $(top_builddir)/hald/freebsd/libprobe/libhald_freebsd_probe.la \
-+ @LIBUSB20_LIBS@
-+endif
-+
-+hald_probe_mouse_SOURCES = probe-mouse.c
-+hald_probe_mouse_CPPFLAGS = $(AM_CPPFLAGS) @GLIB_CFLAGS@
-+hald_probe_mouse_LDADD = \
-+ @GLIB_LIBS@ \
-+ $(top_builddir)/hald/freebsd/libprobe/libhald_freebsd_probe.la \
-+ -lutil
-+
- hald_probe_smbios_SOURCES = probe-smbios.c
- hald_probe_smbios_LDADD = \
- $(top_builddir)/hald/freebsd/libprobe/libhald_freebsd_probe.la
-@@ -41,4 +67,5 @@ hald_probe_volume_CPPFLAGS = $(AM_CPPFLA
- hald_probe_volume_LDADD = \
- @GLIB_LIBS@ \
- @VOLUME_ID_LIBS@ \
-+ -lufs \
- $(top_builddir)/hald/freebsd/libprobe/libhald_freebsd_probe.la
diff --git a/sysutils/hal/files/patch-hald_freebsd_probing_Makefile.in b/sysutils/hal/files/patch-hald_freebsd_probing_Makefile.in
deleted file mode 100644
index 4a8ea2f05..000000000
--- a/sysutils/hal/files/patch-hald_freebsd_probing_Makefile.in
+++ /dev/null
@@ -1,170 +0,0 @@
---- hald/freebsd/probing/Makefile.in.orig 2009-07-16 22:17:53.000000000 -0400
-+++ hald/freebsd/probing/Makefile.in 2009-07-17 02:32:09.000000000 -0400
-@@ -34,10 +34,16 @@ build_triplet = @build@
- host_triplet = @host@
- @HALD_COMPILE_FREEBSD_TRUE@libexec_PROGRAMS = \
- @HALD_COMPILE_FREEBSD_TRUE@ hald-probe-hiddev$(EXEEXT) \
-+@HALD_COMPILE_FREEBSD_TRUE@ hald-probe-mouse$(EXEEXT) \
- @HALD_COMPILE_FREEBSD_TRUE@ hald-probe-scsi$(EXEEXT) \
- @HALD_COMPILE_FREEBSD_TRUE@ hald-probe-smbios$(EXEEXT) \
- @HALD_COMPILE_FREEBSD_TRUE@ hald-probe-storage$(EXEEXT) \
--@HALD_COMPILE_FREEBSD_TRUE@ hald-probe-volume$(EXEEXT)
-+@HALD_COMPILE_FREEBSD_TRUE@ hald-probe-volume$(EXEEXT) \
-+@HALD_COMPILE_FREEBSD_TRUE@ $(am__EXEEXT_1)
-+@HALD_COMPILE_FREEBSD_TRUE@@HAVE_LIBUSB20_TRUE@am__append_1 = \
-+@HALD_COMPILE_FREEBSD_TRUE@@HAVE_LIBUSB20_TRUE@ hald-probe-usb2-device \
-+@HALD_COMPILE_FREEBSD_TRUE@@HAVE_LIBUSB20_TRUE@ hald-probe-usb2-interface
-+
- subdir = hald/freebsd/probing
- DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in
- ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
-@@ -48,12 +54,17 @@ am__configure_deps = $(am__aclocal_m4_de
- mkinstalldirs = $(install_sh) -d
- CONFIG_HEADER = $(top_builddir)/config.h
- CONFIG_CLEAN_FILES =
-+@HALD_COMPILE_FREEBSD_TRUE@@HAVE_LIBUSB20_TRUE@am__EXEEXT_1 = hald-probe-usb2-device$(EXEEXT) \
-+@HALD_COMPILE_FREEBSD_TRUE@@HAVE_LIBUSB20_TRUE@ hald-probe-usb2-interface$(EXEEXT)
- am__installdirs = "$(DESTDIR)$(libexecdir)"
- libexecPROGRAMS_INSTALL = $(INSTALL_PROGRAM)
- PROGRAMS = $(libexec_PROGRAMS)
- am_hald_probe_hiddev_OBJECTS = probe-hiddev.$(OBJEXT)
- hald_probe_hiddev_OBJECTS = $(am_hald_probe_hiddev_OBJECTS)
- hald_probe_hiddev_DEPENDENCIES = $(top_builddir)/hald/freebsd/libprobe/libhald_freebsd_probe.la
-+am_hald_probe_mouse_OBJECTS = hald_probe_mouse-probe-mouse.$(OBJEXT)
-+hald_probe_mouse_OBJECTS = $(am_hald_probe_mouse_OBJECTS)
-+hald_probe_mouse_DEPENDENCIES = $(top_builddir)/hald/freebsd/libprobe/libhald_freebsd_probe.la
- am_hald_probe_scsi_OBJECTS = probe-scsi.$(OBJEXT)
- hald_probe_scsi_OBJECTS = $(am_hald_probe_scsi_OBJECTS)
- hald_probe_scsi_DEPENDENCIES = $(top_builddir)/hald/freebsd/libprobe/libhald_freebsd_probe.la
-@@ -65,6 +76,17 @@ am_hald_probe_storage_OBJECTS = \
- hald_probe_storage-probe-storage.$(OBJEXT)
- hald_probe_storage_OBJECTS = $(am_hald_probe_storage_OBJECTS)
- hald_probe_storage_DEPENDENCIES = $(top_builddir)/hald/freebsd/libprobe/libhald_freebsd_probe.la
-+am__hald_probe_usb2_device_SOURCES_DIST = probe-usb2-device.c
-+@HAVE_LIBUSB20_TRUE@am_hald_probe_usb2_device_OBJECTS = \
-+@HAVE_LIBUSB20_TRUE@ probe-usb2-device.$(OBJEXT)
-+hald_probe_usb2_device_OBJECTS = $(am_hald_probe_usb2_device_OBJECTS)
-+@HAVE_LIBUSB20_TRUE@hald_probe_usb2_device_DEPENDENCIES = $(top_builddir)/hald/freebsd/libprobe/libhald_freebsd_probe.la
-+am__hald_probe_usb2_interface_SOURCES_DIST = probe-usb2-interface.c
-+@HAVE_LIBUSB20_TRUE@am_hald_probe_usb2_interface_OBJECTS = \
-+@HAVE_LIBUSB20_TRUE@ probe-usb2-interface.$(OBJEXT)
-+hald_probe_usb2_interface_OBJECTS = \
-+ $(am_hald_probe_usb2_interface_OBJECTS)
-+@HAVE_LIBUSB20_TRUE@hald_probe_usb2_interface_DEPENDENCIES = $(top_builddir)/hald/freebsd/libprobe/libhald_freebsd_probe.la
- am_hald_probe_volume_OBJECTS = \
- hald_probe_volume-freebsd_dvd_rw_utils.$(OBJEXT) \
- hald_probe_volume-probe-volume.$(OBJEXT)
-@@ -82,11 +104,17 @@ CCLD = $(CC)
- LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
- --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) \
- $(LDFLAGS) -o $@
--SOURCES = $(hald_probe_hiddev_SOURCES) $(hald_probe_scsi_SOURCES) \
-- $(hald_probe_smbios_SOURCES) $(hald_probe_storage_SOURCES) \
-+SOURCES = $(hald_probe_hiddev_SOURCES) $(hald_probe_mouse_SOURCES) \
-+ $(hald_probe_scsi_SOURCES) $(hald_probe_smbios_SOURCES) \
-+ $(hald_probe_storage_SOURCES) \
-+ $(hald_probe_usb2_device_SOURCES) \
-+ $(hald_probe_usb2_interface_SOURCES) \
- $(hald_probe_volume_SOURCES)
--DIST_SOURCES = $(hald_probe_hiddev_SOURCES) $(hald_probe_scsi_SOURCES) \
-+DIST_SOURCES = $(hald_probe_hiddev_SOURCES) \
-+ $(hald_probe_mouse_SOURCES) $(hald_probe_scsi_SOURCES) \
- $(hald_probe_smbios_SOURCES) $(hald_probe_storage_SOURCES) \
-+ $(am__hald_probe_usb2_device_SOURCES_DIST) \
-+ $(am__hald_probe_usb2_interface_SOURCES_DIST) \
- $(hald_probe_volume_SOURCES)
- ETAGS = etags
- CTAGS = ctags
-@@ -263,6 +291,23 @@ hald_probe_hiddev_LDADD = \
- $(top_builddir)/hald/freebsd/libprobe/libhald_freebsd_probe.la \
- -lusbhid
-
-+@HAVE_LIBUSB20_TRUE@hald_probe_usb2_device_SOURCES = probe-usb2-device.c
-+@HAVE_LIBUSB20_TRUE@hald_probe_usb2_device_LDADD = \
-+@HAVE_LIBUSB20_TRUE@ $(top_builddir)/hald/freebsd/libprobe/libhald_freebsd_probe.la \
-+@HAVE_LIBUSB20_TRUE@ @LIBUSB20_LIBS@
-+
-+@HAVE_LIBUSB20_TRUE@hald_probe_usb2_interface_SOURCES = probe-usb2-interface.c
-+@HAVE_LIBUSB20_TRUE@hald_probe_usb2_interface_LDADD = \
-+@HAVE_LIBUSB20_TRUE@ $(top_builddir)/hald/freebsd/libprobe/libhald_freebsd_probe.la \
-+@HAVE_LIBUSB20_TRUE@ @LIBUSB20_LIBS@
-+
-+hald_probe_mouse_SOURCES = probe-mouse.c
-+hald_probe_mouse_CPPFLAGS = $(AM_CPPFLAGS) @GLIB_CFLAGS@
-+hald_probe_mouse_LDADD = \
-+ @GLIB_LIBS@ \
-+ $(top_builddir)/hald/freebsd/libprobe/libhald_freebsd_probe.la \
-+ -lutil
-+
- hald_probe_smbios_SOURCES = probe-smbios.c
- hald_probe_smbios_LDADD = \
- $(top_builddir)/hald/freebsd/libprobe/libhald_freebsd_probe.la
-@@ -283,6 +328,7 @@ hald_probe_volume_CPPFLAGS = $(AM_CPPFLA
- hald_probe_volume_LDADD = \
- @GLIB_LIBS@ \
- @VOLUME_ID_LIBS@ \
-+ -lufs \
- $(top_builddir)/hald/freebsd/libprobe/libhald_freebsd_probe.la
-
- all: all-am
-@@ -349,6 +395,9 @@ clean-libexecPROGRAMS:
- hald-probe-hiddev$(EXEEXT): $(hald_probe_hiddev_OBJECTS) $(hald_probe_hiddev_DEPENDENCIES)
- @rm -f hald-probe-hiddev$(EXEEXT)
- $(LINK) $(hald_probe_hiddev_OBJECTS) $(hald_probe_hiddev_LDADD) $(LIBS)
-+hald-probe-mouse$(EXEEXT): $(hald_probe_mouse_OBJECTS) $(hald_probe_mouse_DEPENDENCIES)
-+ @rm -f hald-probe-mouse$(EXEEXT)
-+ $(LINK) $(hald_probe_mouse_OBJECTS) $(hald_probe_mouse_LDADD) $(LIBS)
- hald-probe-scsi$(EXEEXT): $(hald_probe_scsi_OBJECTS) $(hald_probe_scsi_DEPENDENCIES)
- @rm -f hald-probe-scsi$(EXEEXT)
- $(LINK) $(hald_probe_scsi_OBJECTS) $(hald_probe_scsi_LDADD) $(LIBS)
-@@ -358,6 +407,12 @@ hald-probe-smbios$(EXEEXT): $(hald_probe
- hald-probe-storage$(EXEEXT): $(hald_probe_storage_OBJECTS) $(hald_probe_storage_DEPENDENCIES)
- @rm -f hald-probe-storage$(EXEEXT)
- $(LINK) $(hald_probe_storage_OBJECTS) $(hald_probe_storage_LDADD) $(LIBS)
-+hald-probe-usb2-device$(EXEEXT): $(hald_probe_usb2_device_OBJECTS) $(hald_probe_usb2_device_DEPENDENCIES)
-+ @rm -f hald-probe-usb2-device$(EXEEXT)
-+ $(LINK) $(hald_probe_usb2_device_OBJECTS) $(hald_probe_usb2_device_LDADD) $(LIBS)
-+hald-probe-usb2-interface$(EXEEXT): $(hald_probe_usb2_interface_OBJECTS) $(hald_probe_usb2_interface_DEPENDENCIES)
-+ @rm -f hald-probe-usb2-interface$(EXEEXT)
-+ $(LINK) $(hald_probe_usb2_interface_OBJECTS) $(hald_probe_usb2_interface_LDADD) $(LIBS)
- hald-probe-volume$(EXEEXT): $(hald_probe_volume_OBJECTS) $(hald_probe_volume_DEPENDENCIES)
- @rm -f hald-probe-volume$(EXEEXT)
- $(LINK) $(hald_probe_volume_OBJECTS) $(hald_probe_volume_LDADD) $(LIBS)
-@@ -368,6 +423,7 @@ mostlyclean-compile:
- distclean-compile:
- -rm -f *.tab.c
-
-+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/hald_probe_mouse-probe-mouse.Po@am__quote@
- @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/hald_probe_storage-freebsd_dvd_rw_utils.Po@am__quote@
- @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/hald_probe_storage-probe-storage.Po@am__quote@
- @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/hald_probe_volume-freebsd_dvd_rw_utils.Po@am__quote@
-@@ -375,6 +431,8 @@ distclean-compile:
- @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/probe-hiddev.Po@am__quote@
- @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/probe-scsi.Po@am__quote@
- @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/probe-smbios.Po@am__quote@
-+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/probe-usb2-device.Po@am__quote@
-+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/probe-usb2-interface.Po@am__quote@
-
- .c.o:
- @am__fastdepCC_TRUE@ $(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
-@@ -397,6 +455,20 @@ distclean-compile:
- @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
- @am__fastdepCC_FALSE@ $(LTCOMPILE) -c -o $@ $<
-
-+hald_probe_mouse-probe-mouse.o: probe-mouse.c
-+@am__fastdepCC_TRUE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(hald_probe_mouse_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT hald_probe_mouse-probe-mouse.o -MD -MP -MF $(DEPDIR)/hald_probe_mouse-probe-mouse.Tpo -c -o hald_probe_mouse-probe-mouse.o `test -f 'probe-mouse.c' || echo '$(srcdir)/'`probe-mouse.c
-+@am__fastdepCC_TRUE@ mv -f $(DEPDIR)/hald_probe_mouse-probe-mouse.Tpo $(DEPDIR)/hald_probe_mouse-probe-mouse.Po
-+@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='probe-mouse.c' object='hald_probe_mouse-probe-mouse.o' libtool=no @AMDEPBACKSLASH@
-+@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-+@am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(hald_probe_mouse_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o hald_probe_mouse-probe-mouse.o `test -f 'probe-mouse.c' || echo '$(srcdir)/'`probe-mouse.c
-+
-+hald_probe_mouse-probe-mouse.obj: probe-mouse.c
-+@am__fastdepCC_TRUE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(hald_probe_mouse_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT hald_probe_mouse-probe-mouse.obj -MD -MP -MF $(DEPDIR)/hald_probe_mouse-probe-mouse.Tpo -c -o hald_probe_mouse-probe-mouse.obj `if test -f 'probe-mouse.c'; then $(CYGPATH_W) 'probe-mouse.c'; else $(CYGPATH_W) '$(srcdir)/probe-mouse.c'; fi`
-+@am__fastdepCC_TRUE@ mv -f $(DEPDIR)/hald_probe_mouse-probe-mouse.Tpo $(DEPDIR)/hald_probe_mouse-probe-mouse.Po
-+@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='probe-mouse.c' object='hald_probe_mouse-probe-mouse.obj' libtool=no @AMDEPBACKSLASH@
-+@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-+@am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(hald_probe_mouse_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o hald_probe_mouse-probe-mouse.obj `if test -f 'probe-mouse.c'; then $(CYGPATH_W) 'probe-mouse.c'; else $(CYGPATH_W) '$(srcdir)/probe-mouse.c'; fi`
-+
- hald_probe_storage-freebsd_dvd_rw_utils.o: freebsd_dvd_rw_utils.c
- @am__fastdepCC_TRUE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(hald_probe_storage_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT hald_probe_storage-freebsd_dvd_rw_utils.o -MD -MP -MF $(DEPDIR)/hald_probe_storage-freebsd_dvd_rw_utils.Tpo -c -o hald_probe_storage-freebsd_dvd_rw_utils.o `test -f 'freebsd_dvd_rw_utils.c' || echo '$(srcdir)/'`freebsd_dvd_rw_utils.c
- @am__fastdepCC_TRUE@ mv -f $(DEPDIR)/hald_probe_storage-freebsd_dvd_rw_utils.Tpo $(DEPDIR)/hald_probe_storage-freebsd_dvd_rw_utils.Po
diff --git a/sysutils/hal/files/patch-hald_freebsd_probing_probe-hiddev.c b/sysutils/hal/files/patch-hald_freebsd_probing_probe-hiddev.c
deleted file mode 100644
index ee627c451..000000000
--- a/sysutils/hal/files/patch-hald_freebsd_probing_probe-hiddev.c
+++ /dev/null
@@ -1,37 +0,0 @@
---- hald/freebsd/probing/probe-hiddev.c.orig 2008-05-07 19:24:08.000000000 -0400
-+++ hald/freebsd/probing/probe-hiddev.c 2009-02-24 00:42:06.000000000 -0500
-@@ -25,12 +25,21 @@
- # include <config.h>
- #endif
-
-+#include <sys/param.h>
- #include <unistd.h>
- #include <stdlib.h>
- #include <fcntl.h>
-+#ifndef HAVE_LIBUSB20
- #include <sys/ioctl.h>
- #include <dev/usb/usb.h>
- #include <dev/usb/usbhid.h>
-+#else
-+#if __FreeBSD_version >= 800064
-+#include <dev/usb/usbhid.h>
-+#else
-+#include <dev/usb2/include/usb2_hid.h>
-+#endif
-+#endif
- #include <usbhid.h>
-
- #include "../libprobe/hfp.h"
-@@ -65,7 +74,12 @@ main (int argc, char **argv)
- /* give a meaningful process title for ps(1) */
- setproctitle("%s", device_file);
-
-+#ifdef HAVE_LIBUSB20
-+ report_id = hid_get_report_id(fd);
-+ if (report_id == -1)
-+#else
- if (ioctl(fd, USB_GET_REPORT_ID, &report_id) < 0)
-+#endif
- goto end;
-
- hid_init(NULL);
diff --git a/sysutils/hal/files/patch-hald_freebsd_probing_probe-mouse.c b/sysutils/hal/files/patch-hald_freebsd_probing_probe-mouse.c
deleted file mode 100644
index fd69bf341..000000000
--- a/sysutils/hal/files/patch-hald_freebsd_probing_probe-mouse.c
+++ /dev/null
@@ -1,315 +0,0 @@
---- hald/freebsd/probing/probe-mouse.c.orig 2009-02-04 11:00:00.000000000 -0500
-+++ hald/freebsd/probing/probe-mouse.c 2009-02-04 11:04:43.000000000 -0500
-@@ -0,0 +1,312 @@
-+/***************************************************************************
-+ * CVSID: $Id: patch-hald_freebsd_probing_probe-mouse.c,v 1.1 2009-05-17 05:02:48 marcus Exp $
-+ *
-+ * probe-hiddev.c : Mouse prober
-+ *
-+ * Copyright (C) 2008 Joe Marcus Clarke <marcus@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 <sys/param.h>
-+#if __FreeBSD_version >= 800058
-+#include <sys/types.h>
-+#include <sys/user.h>
-+#include <sys/sysctl.h>
-+#include <libutil.h>
-+#endif
-+#include <unistd.h>
-+#include <stdlib.h>
-+#include <string.h>
-+#include <fcntl.h>
-+#include <glib.h>
-+
-+#include "../libprobe/hfp.h"
-+
-+#if __FreeBSD_version < 800058
-+#define CMD "/usr/bin/fstat %s"
-+#endif
-+
-+#define MOUSE_DRIVER "mouse"
-+#define MOUSED_DEVICE "/dev/sysmouse"
-+#define MOUSED_PROC_NAME "moused"
-+#define XORG_PROC_NAME "Xorg"
-+
-+#if __FreeBSD_version >= 800058
-+static struct kinfo_proc *
-+hfp_kinfo_getproc (int *cntp)
-+{
-+ int mib[3];
-+ int error;
-+ int cnt;
-+ size_t len;
-+ char *buf, *bp, *eb;
-+ struct kinfo_proc *kip, *kp, *ki;
-+
-+ *cntp = 0;
-+
-+ len = 0;
-+ mib[0] = CTL_KERN;
-+ mib[1] = KERN_PROC;
-+ mib[2] = KERN_PROC_PROC;
-+
-+ error = sysctl(mib, 3, NULL, &len, NULL, 0);
-+ if (error)
-+ return NULL;
-+
-+ len = len * 4 / 3;
-+ buf = (char *) g_malloc(len);
-+ if (buf == NULL)
-+ return NULL;
-+
-+ error = sysctl(mib, 3, buf, &len, NULL, 0);
-+ if (error)
-+ {
-+ g_free(buf);
-+ return NULL;
-+ }
-+
-+ cnt = 0;
-+ bp = buf;
-+ eb = buf + len;
-+ while (bp < eb)
-+ {
-+ ki = (struct kinfo_proc *) (uintptr_t) bp;
-+ bp += ki->ki_structsize;
-+ cnt++;
-+ }
-+
-+ kip = calloc(cnt, sizeof (*kip));
-+ if (kip == NULL)
-+ {
-+ g_free(buf);
-+ return NULL;
-+ }
-+
-+ bp = buf;
-+ eb = buf + len;
-+ kp = kip;
-+ while (bp < eb)
-+ {
-+ ki = (struct kinfo_proc *) (uintptr_t) bp;
-+ memcpy(kp, ki, ki->ki_structsize);
-+ bp += ki->ki_structsize;
-+ kp->ki_structsize = sizeof(*kp);
-+ kp++;
-+ }
-+
-+ g_free(buf);
-+ *cntp = cnt;
-+ return kip;
-+}
-+
-+static gboolean
-+device_opened_by_proc (const char *device, const char *proc)
-+{
-+ struct kinfo_proc *kip, *pfreep;
-+ int cnt, i;
-+
-+ pfreep = hfp_kinfo_getproc(&cnt);
-+ if (pfreep == NULL)
-+ return FALSE;
-+
-+ for (i = 0; i < cnt; i++)
-+ {
-+ kip = &pfreep[i];
-+
-+ if (! strcmp(kip->ki_comm, proc))
-+ {
-+ struct kinfo_file *kif, *ffreep;
-+ int fcnt, j;
-+
-+ ffreep = kinfo_getfile(kip->ki_pid, &fcnt);
-+ if (ffreep == NULL)
-+ continue;
-+ for (j = 0; j < fcnt; j++)
-+ {
-+ kif = &ffreep[j];
-+
-+ if (kif->kf_type == KF_TYPE_VNODE &&
-+ ! strcmp(kif->kf_path, device))
-+ {
-+ g_free(ffreep);
-+ g_free(pfreep);
-+ return TRUE;
-+ }
-+ }
-+ g_free(ffreep);
-+ }
-+ }
-+ g_free(pfreep);
-+
-+ return FALSE;
-+}
-+#else
-+static gboolean
-+device_opened_by_proc (const char *device, const char *proc)
-+{
-+ char **lines;
-+ char *output = NULL;
-+ char *cmd;
-+ int i;
-+ gboolean found = FALSE;
-+
-+ cmd = g_strdup_printf(CMD, device);
-+
-+ if (! g_spawn_command_line_sync(cmd, &output, NULL, NULL, NULL))
-+ {
-+ g_free(cmd);
-+ goto done;
-+ }
-+ g_free(cmd);
-+
-+ if (! output || strlen(output) == 0)
-+ goto done;
-+
-+ lines = g_strsplit(output, "\n", 0);
-+ if (g_strv_length(lines) < 2)
-+ {
-+ g_strfreev(lines);
-+ goto done;
-+ }
-+
-+ for (i = 1; lines[i]; i++)
-+ {
-+ char **fields;
-+ guint len;
-+ guint j;
-+
-+ fields = g_strsplit_set(lines[i], " ", 0);
-+ len = g_strv_length(fields);
-+ if (len < 3)
-+ {
-+ g_strfreev(fields);
-+ continue;
-+ }
-+ for (j = 1; j < len && fields[j] && *fields[j] == '\0'; j++)
-+ ;
-+ if (j < len && fields[j] && ! strcmp(fields[j], proc))
-+ {
-+ found = TRUE;
-+ g_strfreev(fields);
-+ break;
-+ }
-+ g_strfreev(fields);
-+ }
-+
-+ g_strfreev(lines);
-+
-+done:
-+ g_free(output);
-+
-+ return found;
-+}
-+#endif
-+
-+static void
-+probe_mouse (const char *device_file)
-+{
-+ gboolean found;
-+ char **udis;
-+ char *driver;
-+ int num_udis;
-+
-+ driver = libhal_device_get_property_string(hfp_ctx, hfp_udi,
-+ "input.x11_driver", &hfp_error);
-+ dbus_error_free(&hfp_error);
-+
-+ found = device_opened_by_proc(device_file, XORG_PROC_NAME);
-+ if (found)
-+ {
-+ if (driver)
-+ {
-+ libhal_device_remove_property(hfp_ctx, hfp_udi, "input.x11_driver",
-+ &hfp_error);
-+ dbus_error_free(&hfp_error);
-+ g_free(driver);
-+ }
-+ return;
-+ }
-+
-+ found = device_opened_by_proc(device_file, MOUSED_PROC_NAME);
-+ if (found)
-+ {
-+ libhal_device_set_property_string(hfp_ctx, hfp_udi, "input.device",
-+ MOUSED_DEVICE, &hfp_error);
-+ dbus_error_free(&hfp_error);
-+ found = device_opened_by_proc(MOUSED_DEVICE, XORG_PROC_NAME);
-+ if (! found)
-+ {
-+ udis = libhal_manager_find_device_string_match(hfp_ctx,
-+ "input.device",
-+ MOUSED_DEVICE,
-+ &num_udis,
-+ &hfp_error);
-+ dbus_error_free(&hfp_error);
-+ if (num_udis > 0 && udis != NULL && !strcmp(udis[0], hfp_udi)) {
-+ libhal_device_set_property_string(hfp_ctx, hfp_udi,
-+ "input.x11_driver",
-+ MOUSE_DRIVER, &hfp_error);
-+ dbus_error_free(&hfp_error);
-+ libhal_free_string_array(udis);
-+ }
-+ }
-+ else if (driver)
-+ {
-+ libhal_device_remove_property(hfp_ctx, hfp_udi, "input.x11_driver",
-+ &hfp_error);
-+ dbus_error_free(&hfp_error);
-+ }
-+ }
-+ else
-+ {
-+ libhal_device_set_property_string(hfp_ctx, hfp_udi, "input.device",
-+ device_file, &hfp_error);
-+ dbus_error_free(&hfp_error);
-+ libhal_device_set_property_string(hfp_ctx, hfp_udi, "input.x11_driver",
-+ MOUSE_DRIVER, &hfp_error);
-+ dbus_error_free(&hfp_error);
-+ }
-+
-+ g_free(driver);
-+}
-+
-+int
-+main (int argc, char **argv)
-+{
-+ char *device_file;
-+
-+ if (! hfp_init(argc, argv))
-+ goto end;
-+
-+ device_file = getenv("HAL_PROP_FREEBSD_DEVICE_FILE");
-+ if (! device_file)
-+ goto end;
-+
-+ /* give a meaningful process title for ps(1) */
-+ setproctitle("%s", device_file);
-+
-+ /* Sleep for a second to give moused a chance to connect. */
-+ sleep(1);
-+ probe_mouse(device_file);
-+
-+ end:
-+ return 0;
-+}
diff --git a/sysutils/hal/files/patch-hald_freebsd_probing_probe-storage.c b/sysutils/hal/files/patch-hald_freebsd_probing_probe-storage.c
deleted file mode 100644
index d67ce03bf..000000000
--- a/sysutils/hal/files/patch-hald_freebsd_probing_probe-storage.c
+++ /dev/null
@@ -1,39 +0,0 @@
---- hald/freebsd/probing/probe-storage.c.orig 2009-01-12 16:07:59.000000000 -0500
-+++ hald/freebsd/probing/probe-storage.c 2009-01-12 16:20:20.000000000 -0500
-@@ -31,6 +31,8 @@
- #include <unistd.h>
- #include <errno.h>
- #include <sys/types.h>
-+#include <sys/ioctl.h>
-+#include <sys/disk.h>
- #include <netinet/in.h>
- #include <glib.h>
- #include <libvolume_id.h>
-@@ -211,7 +213,26 @@ main (int argc, char **argv)
- goto end;
-
- if (hfp_cdrom_test_unit_ready(cdrom))
-- ret = 2; /* has media */
-+ {
-+ int fd;
-+ off_t size;
-+
-+ libhal_device_set_property_bool(hfp_ctx, hfp_udi, "storage.removable.media_available", TRUE, &hfp_error);
-+ fd = open(device_file, O_RDONLY | O_NONBLOCK);
-+ if (fd > -1)
-+ {
-+ if (ioctl (fd, DIOCGMEDIASIZE, &size) == 0)
-+ {
-+ libhal_device_set_property_uint64(hfp_ctx, hfp_udi, "storage.removable.media_size", size, &hfp_error);
-+ }
-+ close(fd);
-+ }
-+ ret = 2; /* has media */
-+ }
-+ else
-+ {
-+ libhal_device_set_property_bool(hfp_ctx, hfp_udi, "storage.removable.media_available", FALSE, &hfp_error);
-+ }
-
- hfp_cdrom_free(cdrom);
- }
diff --git a/sysutils/hal/files/patch-hald_freebsd_probing_probe-usb2-device.c b/sysutils/hal/files/patch-hald_freebsd_probing_probe-usb2-device.c
deleted file mode 100644
index a81b93ca8..000000000
--- a/sysutils/hal/files/patch-hald_freebsd_probing_probe-usb2-device.c
+++ /dev/null
@@ -1,211 +0,0 @@
---- hald/freebsd/probing/probe-usb2-device.c.orig 2009-05-30 03:09:03.000000000 -0400
-+++ hald/freebsd/probing/probe-usb2-device.c 2009-05-30 03:10:48.000000000 -0400
-@@ -0,0 +1,208 @@
-+/***************************************************************************
-+ * CVSID: $Id: patch-hald_freebsd_probing_probe-usb2-device.c,v 1.3 2009-05-30 07:25:09 marcus Exp $
-+ *
-+ * probe-usb2-device.c : USB2 Device poller
-+ *
-+ * Copyright (C) 2009 Joe Marcus Clarke <marcus@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 <sys/param.h>
-+#include <sys/types.h>
-+#include <stdio.h>
-+#include <stdlib.h>
-+#include <string.h>
-+#include <unistd.h>
-+
-+#include <libusb20_desc.h>
-+#include <libusb20.h>
-+#if __FreeBSD_version >= 800064
-+#include <dev/usb/usb_ioctl.h>
-+#else
-+#include <dev/usb2/include/usb2_standard.h>
-+#include <dev/usb2/include/usb2_ioctl.h>
-+#endif
-+
-+#include "../libprobe/hfp.h"
-+
-+int
-+main(int argc, char **argv)
-+{
-+ struct libusb20_backend *pbe = NULL;
-+ struct libusb20_device *pdev = NULL;
-+ char *busstr, *addrstr;
-+ int bus, addr;
-+
-+ if (! hfp_init(argc, argv))
-+ goto end;
-+
-+ pbe = libusb20_be_alloc_default();
-+ if (pbe == NULL)
-+ goto end;
-+
-+ busstr = getenv("HAL_PROP_USB_DEVICE_BUS_NUMBER");
-+ if (! busstr)
-+ goto end;
-+
-+ addrstr = getenv("HAL_PROP_USB_DEVICE_PORT_NUMBER");
-+ if (! addrstr)
-+ goto end;
-+
-+ bus = atoi(busstr);
-+ addr = atoi(addrstr);
-+
-+ while ((pdev = libusb20_be_device_foreach(pbe, pdev)))
-+ {
-+ struct LIBUSB20_DEVICE_DESC_DECODED *ddesc;
-+ struct LIBUSB20_CONFIG_DESC_DECODED *cdesc;
-+#if __FreeBSD_version >= 800092
-+ struct usb_device_info di;
-+#else
-+ struct usb2_device_info di;
-+#endif
-+ struct libusb20_config *pcfg = NULL;
-+ int curr_config;
-+ int bcdspeed = 0;
-+ uint8_t temp_string[256];
-+ double speed = 0.0;
-+ double version = 1.0;
-+
-+ if (libusb20_dev_get_bus_number(pdev) != bus ||
-+ libusb20_dev_get_address(pdev) != addr)
-+ continue;
-+
-+ if (libusb20_dev_open(pdev, 0))
-+ continue;
-+
-+ ddesc = libusb20_dev_get_device_desc(pdev);
-+ curr_config = libusb20_dev_get_config_index(pdev);
-+ pcfg = libusb20_dev_alloc_config(pdev, curr_config);
-+ cdesc = &(pcfg->desc);
-+
-+ if (pcfg == NULL || libusb20_dev_get_info(pdev, &di))
-+ {
-+ free(pcfg);
-+ continue;
-+ }
-+
-+ memset(temp_string, 0, sizeof(temp_string));
-+
-+ if (cdesc->iConfiguration !=0)
-+ libusb20_dev_req_string_simple_sync(pdev, cdesc->iConfiguration,
-+ temp_string, sizeof(temp_string));
-+
-+ libhal_device_set_property_string(hfp_ctx, hfp_udi,
-+ "usb_device.configuration", (char *) temp_string, &hfp_error);
-+ libhal_device_set_property_int(hfp_ctx, hfp_udi,
-+ "usb_device.configuration_value", cdesc->bConfigurationValue,
-+ &hfp_error);
-+ libhal_device_set_property_int(hfp_ctx, hfp_udi,
-+ "usb_device.num_configurations", ddesc->bNumConfigurations,
-+ &hfp_error);
-+ libhal_device_set_property_int(hfp_ctx, hfp_udi,
-+ "usb_device.device_class", di.udi_class, &hfp_error);
-+ libhal_device_set_property_int(hfp_ctx, hfp_udi,
-+ "usb_device.device_subclass", di.udi_subclass, &hfp_error);
-+ libhal_device_set_property_int(hfp_ctx, hfp_udi,
-+ "usb_device.device_protocol", di.udi_protocol, &hfp_error);
-+ libhal_device_set_property_bool(hfp_ctx, hfp_udi,
-+ "usb_device.is_self_powered",
-+ di.udi_power == 0 ? TRUE : FALSE, &hfp_error);
-+ libhal_device_set_property_bool(hfp_ctx, hfp_udi,
-+ "usb_device.can_wake_up",
-+ (cdesc->bmAttributes & UC_REMOTE_WAKEUP) != 0 ? TRUE : FALSE,
-+ &hfp_error);
-+ libhal_device_set_property_int(hfp_ctx, hfp_udi,
-+ "usb_device.max_power", di.udi_power, &hfp_error);
-+ libhal_device_set_property_int(hfp_ctx, hfp_udi,
-+ "usb_device.num_interfaces", pcfg->num_interface, &hfp_error);
-+ libhal_device_set_property_int(hfp_ctx, hfp_udi,
-+ "usb_device.num_ports", di.udi_nports, &hfp_error);
-+
-+ switch (libusb20_dev_get_speed(pdev))
-+ {
-+ case LIBUSB20_SPEED_LOW:
-+ speed = 1.5;
-+ bcdspeed = 0x00150;
-+ break;
-+ case LIBUSB20_SPEED_FULL:
-+ speed = 12.0;
-+ bcdspeed = 0x01200;
-+ break;
-+ case LIBUSB20_SPEED_HIGH:
-+ speed = 480.0;
-+ bcdspeed = 0x48000;
-+ break;
-+ case LIBUSB20_SPEED_SUPER:
-+ speed = 4800.0;
-+ bcdspeed = 0x480000;
-+ break;
-+ default:
-+ ;
-+ }
-+
-+ libhal_device_set_property_double(hfp_ctx, hfp_udi, "usb_device.speed",
-+ speed, &hfp_error);
-+ libhal_device_set_property_int(hfp_ctx, hfp_udi, "usb_device.speed_bcd",
-+ bcdspeed, &hfp_error);
-+
-+ switch (ddesc->bcdUSB)
-+ {
-+ case UD_USB_2_0:
-+ version = 2.0;
-+ break;
-+ case UD_USB_3_0:
-+ version = 3.0;
-+ break;
-+ default:
-+ version = 1.0;
-+ break;
-+ }
-+
-+ libhal_device_set_property_double(hfp_ctx, hfp_udi,
-+ "usb_device.version", version, &hfp_error);
-+ libhal_device_set_property_int(hfp_ctx, hfp_udi,
-+ "usb_device.product_id", di.udi_productNo, &hfp_error);
-+ libhal_device_set_property_int(hfp_ctx, hfp_udi,
-+ "usb_device.vendor_id", di.udi_vendorNo, &hfp_error);
-+ libhal_device_set_property_int(hfp_ctx, hfp_udi,
-+ "usb_device.device_revision_bcd", ddesc->bcdUSB, &hfp_error);
-+ libhal_device_set_property_string(hfp_ctx, hfp_udi,
-+ "usb_device.serial", di.udi_serial, &hfp_error);
-+ libhal_device_set_property_string(hfp_ctx, hfp_udi,
-+ "usb_device.product", di.udi_product, &hfp_error);
-+ libhal_device_set_property_string(hfp_ctx, hfp_udi,
-+ "usb_device.vendor", di.udi_vendor, &hfp_error);
-+
-+ libhal_device_set_property_string(hfp_ctx, hfp_udi,
-+ "info.product", di.udi_product, &hfp_error);
-+ libhal_device_set_property_string(hfp_ctx, hfp_udi,
-+ "info.vendor", di.udi_vendor, &hfp_error);
-+
-+ libusb20_dev_close(pdev);
-+ free(pcfg);
-+ }
-+end:
-+ if (pbe)
-+ libusb20_be_free(pbe);
-+
-+ return 0;
-+}
diff --git a/sysutils/hal/files/patch-hald_freebsd_probing_probe-usb2-interface.c b/sysutils/hal/files/patch-hald_freebsd_probing_probe-usb2-interface.c
deleted file mode 100644
index d8010b3e7..000000000
--- a/sysutils/hal/files/patch-hald_freebsd_probing_probe-usb2-interface.c
+++ /dev/null
@@ -1,143 +0,0 @@
---- hald/freebsd/probing/probe-usb2-interface.c.orig 2009-02-24 00:36:27.000000000 -0500
-+++ hald/freebsd/probing/probe-usb2-interface.c 2009-02-24 00:39:42.000000000 -0500
-@@ -0,0 +1,140 @@
-+/***************************************************************************
-+ * CVSID: $Id: patch-hald_freebsd_probing_probe-usb2-interface.c,v 1.1 2009-05-17 05:02:48 marcus Exp $
-+ *
-+ * probe-usb2-interface.c : USB2 Interface poller
-+ *
-+ * Copyright (C) 2009 Joe Marcus Clarke <marcus@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 <sys/param.h>
-+#include <sys/types.h>
-+#include <stdio.h>
-+#include <stdlib.h>
-+#include <string.h>
-+#include <unistd.h>
-+
-+#include <libusb20_desc.h>
-+#include <libusb20.h>
-+#if __FreeBSD_version >= 800064
-+#include <dev/usb/usb_ioctl.h>
-+#else
-+#include <dev/usb2/include/usb2_standard.h>
-+#include <dev/usb2/include/usb2_ioctl.h>
-+#endif
-+
-+#include "../libprobe/hfp.h"
-+
-+int
-+main(int argc, char **argv)
-+{
-+ struct libusb20_backend *pbe = NULL;
-+ struct libusb20_device *pdev = NULL;
-+ char *busstr, *addrstr, *ifacestr;
-+ int bus, addr, iface;
-+
-+ if (! hfp_init(argc, argv))
-+ goto end;
-+
-+ pbe = libusb20_be_alloc_default();
-+ if (pbe == NULL)
-+ goto end;
-+
-+ busstr = getenv("HAL_PROP_USB_DEVICE_BUS_NUMBER");
-+ if (! busstr)
-+ goto end;
-+
-+ addrstr = getenv("HAL_PROP_USB_DEVICE_PORT_NUMBER");
-+ if (! addrstr)
-+ goto end;
-+
-+ ifacestr = getenv("HAL_PROP_USB_INTERFACE_NUMBER");
-+ if (! ifacestr)
-+ goto end;
-+
-+ bus = atoi(busstr);
-+ addr = atoi(addrstr);
-+ iface = atoi(ifacestr);
-+
-+ while ((pdev = libusb20_be_device_foreach(pbe, pdev)))
-+ {
-+ struct LIBUSB20_INTERFACE_DESC_DECODED *idesc;
-+ struct libusb20_config *pcfg = NULL;
-+ struct libusb20_interface *pif;
-+ uint8_t temp_string[256];
-+ char ifdrv[128];
-+ int curr_config;
-+
-+ if (libusb20_dev_get_bus_number(pdev) != bus ||
-+ libusb20_dev_get_address(pdev) != addr)
-+ continue;
-+
-+ if (libusb20_dev_open(pdev, 0))
-+ continue;
-+
-+ curr_config = libusb20_dev_get_config_index(pdev);
-+ pcfg = libusb20_dev_alloc_config(pdev, curr_config);
-+ if (! pcfg)
-+ continue;
-+
-+ pif = pcfg->interface + iface;
-+
-+ idesc = &pif->desc;
-+
-+ libhal_device_set_property_int(hfp_ctx, hfp_udi,
-+ "usb.interface.class", idesc->bInterfaceClass, &hfp_error);
-+ libhal_device_set_property_int(hfp_ctx, hfp_udi,
-+ "usb.interface.subclass", idesc->bInterfaceSubClass, &hfp_error);
-+ libhal_device_set_property_int(hfp_ctx, hfp_udi,
-+ "usb.interface.protocol", idesc->bInterfaceProtocol, &hfp_error);
-+
-+ memset(temp_string, 0, sizeof(temp_string));
-+ if (idesc->iInterface != 0)
-+ libusb20_dev_req_string_simple_sync(pdev, idesc->iInterface,
-+ temp_string, sizeof(temp_string));
-+
-+ libhal_device_set_property_string(hfp_ctx, hfp_udi,
-+ "usb.interface.description", (char *) temp_string, &hfp_error);
-+
-+ memset(ifdrv, 0, sizeof(ifdrv));
-+ libusb20_dev_get_iface_desc(pdev, iface, ifdrv, sizeof(ifdrv));
-+ if (ifdrv[0] != '\0')
-+ {
-+ char *ifdesc;
-+
-+ ifdesc = strchr(ifdrv, ':');
-+ if (ifdesc)
-+ {
-+ *ifdesc = '\0';
-+ libhal_device_set_property_string(hfp_ctx, hfp_udi,
-+ "usb.freebsd.devname", ifdrv, &hfp_error);
-+ }
-+ }
-+
-+ free(pcfg);
-+ }
-+
-+end:
-+ if (pbe)
-+ libusb20_be_free(pbe);
-+
-+ return 0;
-+}
diff --git a/sysutils/hal/files/patch-hald_freebsd_probing_probe-volume.c b/sysutils/hal/files/patch-hald_freebsd_probing_probe-volume.c
deleted file mode 100644
index c92b70266..000000000
--- a/sysutils/hal/files/patch-hald_freebsd_probing_probe-volume.c
+++ /dev/null
@@ -1,74 +0,0 @@
---- hald/freebsd/probing/probe-volume.c.orig 2008-08-10 09:50:10.000000000 -0400
-+++ hald/freebsd/probing/probe-volume.c 2009-09-26 03:54:16.000000000 -0400
-@@ -36,7 +36,12 @@
- #include <sys/disk.h>
- #include <sys/cdio.h>
- #include <sys/param.h>
-+#include <sys/mount.h>
- #include <sys/types.h>
-+#include <ufs/ufs/ufsmount.h>
-+#include <ufs/ufs/dinode.h>
-+#include <ufs/ffs/fs.h>
-+#include <libufs.h>
- #include <isofs/cd9660/iso.h>
- #include <glib.h>
- #include <libvolume_id.h>
-@@ -502,7 +507,8 @@ main (int argc, char **argv)
- hfp_cdrom_free(cdrom);
- }
-
-- if (has_data)
-+ if (has_data && vid && (! strcmp(vid->type, "iso9660") ||
-+ ! strcmp(vid->type, "udf")))
- hf_probe_volume_advanced_disc_detect(fd);
- }
- else
-@@ -555,6 +561,48 @@ main (int argc, char **argv)
-
- libhal_device_set_property_bool(hfp_ctx, hfp_udi, "volume.ignore", has_children || is_swap, &hfp_error);
-
-+ if (vid && ! strcmp (vid->type, "ufs"))
-+ {
-+ struct uufsd ufsdisk;
-+
-+ if (ufs_disk_fillout(&ufsdisk, device_file) == 0)
-+ {
-+ char ufsid[64];
-+ char **ufs_devs = NULL;
-+ int num_udis;
-+ int i;
-+
-+ snprintf(ufsid, sizeof(ufsid), "%08x%08x", ufsdisk.d_fs.fs_id[0], ufsdisk.d_fs.fs_id[1]);
-+ libhal_device_set_property_string(hfp_ctx, hfp_udi, "volume.freebsd.ufsid", ufsid, &hfp_error);
-+ dbus_error_free(&hfp_error);
-+ ufs_devs = libhal_manager_find_device_string_match(hfp_ctx,
-+ "volume.freebsd.ufsid",
-+ ufsid,
-+ &num_udis,
-+ &hfp_error);
-+ dbus_error_free(&hfp_error);
-+ for (i = 0; i < num_udis; i++)
-+ {
-+ if (ufs_devs[i] != NULL && strcmp(ufs_devs[i], hfp_udi))
-+ {
-+ gboolean mounted;
-+
-+ mounted = libhal_device_get_property_bool(hfp_ctx, ufs_devs[i], "volume.is_mounted", &hfp_error);
-+ dbus_error_free(&hfp_error);
-+ if (mounted)
-+ {
-+ libhal_device_set_property_bool(hfp_ctx, hfp_udi, "volume.ignore", TRUE, &hfp_error);
-+ dbus_error_free(&hfp_error);
-+ break;
-+ }
-+ }
-+ }
-+ if (ufs_devs)
-+ libhal_free_string_array(ufs_devs);
-+ ufs_disk_close(&ufsdisk);
-+ }
-+ }
-+
- if (has_children)
- usage = "partitiontable";
- else if (is_swap)
diff --git a/sysutils/hal/files/patch-hald_hf-storage.c b/sysutils/hal/files/patch-hald_hf-storage.c
deleted file mode 100644
index a699ca827..000000000
--- a/sysutils/hal/files/patch-hald_hf-storage.c
+++ /dev/null
@@ -1,279 +0,0 @@
---- hald/freebsd/hf-storage.c.orig 2009-05-12 08:24:28.000000000 -0400
-+++ hald/freebsd/hf-storage.c 2009-10-24 02:30:22.000000000 -0400
-@@ -30,6 +30,8 @@
- #include <limits.h>
- #include <inttypes.h>
- #include <string.h>
-+#include <unistd.h>
-+#include <sys/param.h>
- #include <sys/types.h>
- #include <sys/disklabel.h>
-
-@@ -38,6 +40,7 @@
-
- #include "hf-storage.h"
- #include "hf-block.h"
-+#include "hf-devd.h"
- #include "hf-devtree.h"
- #include "hf-volume.h"
- #include "hf-util.h"
-@@ -64,7 +67,7 @@ typedef struct
- static GNode *hf_storage_geom_tree = NULL;
- static GHashTable *hf_storage_geom_hash = NULL;
-
--static void hf_storage_init_geom (void);
-+static void hf_storage_init_geom (gboolean force);
- static gboolean hf_storage_device_has_addon (HalDevice *device);
-
- static void
-@@ -104,6 +107,8 @@ hf_storage_class_is_partitionable (const
- {
- return (! strcmp(geom_class, "MBR") ||
- ! strcmp(geom_class, "MBREXT") ||
-+ ! strcmp(geom_class, "PART") ||
-+ ! strcmp(geom_class, "JOURNAL") ||
- ! strcmp(geom_class, "GPT") ||
- ! strcmp(geom_class, "APPLE") || ! strcmp(geom_class, "SUN"));
- }
-@@ -117,6 +122,7 @@ hf_storage_geom_has_partitions (const Ge
- if (g_node_n_children(node) > 0)
- return TRUE;
-
-+ /*
- if (hf_storage_class_is_partitionable(geom_obj->class) &&
- g_node_next_sibling(node) != NULL)
- {
-@@ -135,6 +141,7 @@ hf_storage_geom_has_partitions (const Ge
- return TRUE;
- }
- }
-+ */
-
- return FALSE;
- }
-@@ -294,7 +301,7 @@ hf_storage_device_probe (HalDevice *devi
- {
- g_return_if_fail(HAL_IS_DEVICE(device));
-
-- hf_storage_init_geom();
-+ hf_storage_init_geom(TRUE);
-
- if (hf_runner_run_sync(device, 0, "hald-probe-storage",
- "HF_HAS_CHILDREN", HF_BOOL_TO_STRING(hf_storage_device_has_partitions(device)),
-@@ -403,13 +410,49 @@ hf_storage_parse_conftxt (const char *co
- continue;
- }
-
-+ depth = atoi(fields[0]);
-+ hash = g_str_hash(fields[2]);
-+ if (g_hash_table_lookup(table, GUINT_TO_POINTER(hash)) != NULL)
-+ {
-+ g_strfreev(fields);
-+ curr_depth = depth;
-+ continue;
-+ }
-+
-+ /* XXX This is a hack, but we need to ignore dynamic labels like
-+ * ufsids which are created and destroyed based on whether or not
-+ * the actual device is mounted or not. If we don't then strange
-+ * things happen in applications like nautilus.
-+ */
-+ if ((! strcmp(fields[1], "LABEL") ||
-+ ! strcmp(fields[1], "BSD")) &&
-+ ! strncmp(fields[2], "ufsid/", strlen("ufsid/")))
-+ {
-+ g_strfreev(fields);
-+ continue;
-+ }
-+
- geom_obj = g_new0(Geom_Object, 1);
-
-- depth = atoi(fields[0]);
- geom_obj->class = g_strdup(fields[1]);
- geom_obj->dev = g_strdup(fields[2]);
-+ /* Allow for spaces in label names. */
-+ if (! strcmp(fields[1], "LABEL"))
-+ {
-+ int j;
-+
-+ for (j = 3; g_strv_length(fields) > (j + 2) &&
-+ strcmp(fields[j + 2], "i"); j++)
-+ {
-+ char *tmp;
-+
-+ tmp = g_strdup_printf("%s %s", geom_obj->dev, fields[j]);
-+ g_free(geom_obj->dev);
-+ geom_obj->dev = tmp;
-+ }
-+ }
-+
- geom_obj->type = -1; /* We use -1 here to denote a missing type. */
-- hash = g_str_hash(geom_obj->dev);
- geom_obj->hash = hash;
-
- if (g_strv_length(fields) >= 5)
-@@ -433,6 +476,30 @@ hf_storage_parse_conftxt (const char *co
- if (! strcmp (geom_obj->class, "GPT") ||
- ! strcmp (geom_obj->class, "APPLE"))
- geom_obj->str_type = g_strdup(fields[10]);
-+ else if (! strcmp (geom_obj->class, "PART"))
-+ {
-+ geom_obj->str_type = g_strdup(fields[10]);
-+ if (g_strv_length(fields) >= 15)
-+ {
-+ if (! strcmp(fields[13], "xt"))
-+ {
-+ geom_obj->type = atoi(fields[14]);
-+ if (! strcmp(fields[11], "xs"))
-+ {
-+ g_free(geom_obj->class);
-+ geom_obj->class = g_strdup(fields[12]);
-+ }
-+ }
-+ }
-+ }
-+ else if (fields[10][0] == '!')
-+ {
-+ char *nottype;
-+
-+ nottype = fields[10];
-+ nottype++;
-+ geom_obj->type = atoi(nottype);
-+ }
- else
- geom_obj->type = atoi(fields[10]);
- }
-@@ -541,17 +608,27 @@ hf_storage_device_rescan_real (HalDevice
- }
-
- static gboolean
--hf_storage_conftxt_timeout_cb (gpointer data)
-+hf_storage_devd_notify (const char *system,
-+ const char *subsystem,
-+ const char *type,
-+ const char *data)
- {
- static GSList *disks = NULL;
- static gboolean first = TRUE;
-+ gboolean handled = FALSE;
- char *conftxt;
- GSList *new_disks;
-
-- if (hf_is_waiting)
-- return TRUE;
-+ if (! data || strcmp(system, "DEVFS") || strcmp(subsystem, "CDEV") ||
-+ (strcmp(type, "CREATE") && strcmp(type, "DESTROY")))
-+ return FALSE;
-+
-+ if (! strcmp(type, "DESTROY"))
-+ g_usleep(G_USEC_PER_SEC/2);
-
- conftxt = hf_get_string_sysctl(NULL, "kern.geom.conftxt");
-+ if (! conftxt)
-+ return FALSE;
- new_disks = hf_storage_parse_conftxt(conftxt);
- g_free(conftxt);
-
-@@ -572,6 +649,7 @@ hf_storage_conftxt_timeout_cb (gpointer
- if (! hf_storage_find_disk(disks, disk->name))
- {
- osspec_probe(); /* catch new disk(s) */
-+ handled = TRUE;
- break;
- }
- }
-@@ -593,7 +671,10 @@ hf_storage_conftxt_timeout_cb (gpointer
- device = hf_devtree_find_from_name(hald_get_gdl(), disk->name);
- if (device && hal_device_has_capability(device, "storage") &&
- ! hf_storage_device_has_addon(device))
-- hf_storage_device_rescan_real(device);
-+ {
-+ hf_storage_device_rescan_real(device);
-+ handled = TRUE;
-+ }
- }
- }
- else
-@@ -601,7 +682,10 @@ hf_storage_conftxt_timeout_cb (gpointer
- /* disk removed */
- device = hf_devtree_find_from_name(hald_get_gdl(), disk->name);
- if (device && hal_device_has_capability(device, "storage"))
-- hf_device_remove_tree(device);
-+ {
-+ hf_device_remove_tree(device);
-+ handled = TRUE;
-+ }
- }
- }
- }
-@@ -610,17 +694,30 @@ hf_storage_conftxt_timeout_cb (gpointer
- g_slist_free(disks);
- disks = new_disks;
-
-+ return handled;
-+}
-+
-+#if __FreeBSD_version < 700110
-+static gboolean
-+hf_storage_conftxt_timeout_cb (gpointer data)
-+{
-+ if (hf_is_waiting)
-+ return TRUE;
-+
-+ hf_storage_devd_notify("DEVFS", "CDEV", "CREATE", "");
-+
- return TRUE;
- }
-+#endif
-
- static void
--hf_storage_init_geom (void)
-+hf_storage_init_geom (gboolean force)
- {
- char *conftxt;
- static gboolean inited = FALSE;
- GSList *disks;
-
-- if (inited)
-+ if (inited && ! force)
- return;
-
- conftxt = hf_get_string_sysctl(NULL, "kern.geom.conftxt");
-@@ -636,8 +733,10 @@ hf_storage_init_geom (void)
- static void
- hf_storage_init (void)
- {
-- hf_storage_init_geom();
-+ hf_storage_init_geom(FALSE);
-+#if __FreeBSD_version < 700110
- g_timeout_add(3000, hf_storage_conftxt_timeout_cb, NULL);
-+#endif
- }
-
- void
-@@ -719,8 +818,6 @@ hf_storage_device_add (HalDevice *device
- {
- g_return_if_fail(HAL_IS_DEVICE(device));
-
-- hf_storage_init_geom();
--
- if (hf_device_preprobe(device))
- {
- hf_storage_device_probe(device, FALSE);
-@@ -738,7 +835,7 @@ hf_storage_get_geoms (const char *devnam
-
- g_return_val_if_fail(devname != NULL, NULL);
-
-- hf_storage_init_geom();
-+ hf_storage_init_geom(FALSE);
-
- hash = g_str_hash(devname);
- node = g_node_find(hf_storage_geom_tree, G_PRE_ORDER, G_TRAVERSE_ALL,
-@@ -801,3 +898,7 @@ HFHandler hf_storage_handler = {
- .probe = hf_storage_probe,
- .device_rescan = hf_storage_device_rescan
- };
-+
-+HFDevdHandler hf_storage_devd_handler = {
-+ .notify = hf_storage_devd_notify
-+};
diff --git a/sysutils/hal/files/patch-tools_hal-storage-eject.c b/sysutils/hal/files/patch-tools_hal-storage-eject.c
deleted file mode 100644
index 730e2a076..000000000
--- a/sysutils/hal/files/patch-tools_hal-storage-eject.c
+++ /dev/null
@@ -1,11 +0,0 @@
---- tools/hal-storage-eject.c.orig 2008-10-27 13:23:11.000000000 -0400
-+++ tools/hal-storage-eject.c 2008-10-27 13:23:23.000000000 -0400
-@@ -190,7 +190,7 @@ main (int argc, char *argv[])
- unknown_eject_error ("Cannot obtain lock on /media/.hal-mtab");
- }
- handle_unmount (hal_ctx,
-- udi, volume_to_unmount, drive,
-+ volume_udi, volume_to_unmount, drive,
- libhal_volume_get_device_file (volume_to_unmount),
- invoked_by_uid, invoked_by_syscon_name,
- FALSE, FALSE); /* use neither lazy nor force */
diff --git a/sysutils/hal/files/patch-tools_hal-storage-mount.c b/sysutils/hal/files/patch-tools_hal-storage-mount.c
deleted file mode 100644
index 390d35111..000000000
--- a/sysutils/hal/files/patch-tools_hal-storage-mount.c
+++ /dev/null
@@ -1,91 +0,0 @@
---- tools/hal-storage-mount.c.orig 2008-05-07 19:24:23.000000000 -0400
-+++ tools/hal-storage-mount.c 2008-10-09 00:54:34.000000000 -0400
-@@ -56,8 +56,9 @@
-
- #ifdef __FreeBSD__
- #define MOUNT "/sbin/mount"
--#define MOUNT_OPTIONS "noexec,nosuid"
-+#define MOUNT_OPTIONS "nosuid"
- #define MOUNT_TYPE_OPT "-t"
-+#define FUSE_DB "/tmp/.fuse-mnts"
- #elif sun
- #define MOUNT "/sbin/mount"
- #define MOUNT_OPTIONS "noexec,nosuid"
-@@ -255,6 +256,51 @@ out:
- return f;
- }
-
-+#ifdef __FreeBSD__
-+static char *
-+resolve_fuse (const char *special)
-+{
-+ gchar *contents;
-+ gchar **lines;
-+ gsize len;
-+ int i;
-+
-+ if (! g_file_get_contents (FUSE_DB, &contents, &len, NULL))
-+ return g_strdup (special);
-+
-+ lines = g_strsplit (contents, "\n", 0);
-+ g_free (contents);
-+
-+ for (i = 0; lines && lines[i]; i++) {
-+ gchar **fields;
-+
-+ fields = g_strsplit (lines[i], "=", 2);
-+ if (fields && g_strv_length (fields) == 2) {
-+ if (strcmp (fields[0], special) == 0) {
-+ g_strfreev (fields);
-+ g_strfreev (lines);
-+ return g_strdup (fields[1]);
-+ }
-+ }
-+ g_strfreev (fields);
-+ }
-+
-+ g_strfreev (lines);
-+
-+ return g_strdup (special);
-+}
-+#endif
-+
-+static char *
-+resolve_special (const char *special)
-+{
-+#ifdef __FreeBSD__
-+ if (strstr(special, "fuse"))
-+ return resolve_fuse (special);
-+#endif
-+ return g_strdup (special);
-+}
-+
- static LibHalVolume *
- volume_findby (LibHalContext *hal_ctx, const char *property, const char *value)
- {
-@@ -400,18 +446,20 @@ device_is_mounted (const char *device, c
- unknown_error ("Cannot open /etc/mtab or equivalent");
- }
- while (((entry = mtab_next (handle, mount_point)) != NULL) && (ret == FALSE)) {
-- char *resolved;
-+ char *resolved, *rspecial;
-
- resolved = resolve_symlink (entry);
-+ rspecial = resolve_special (resolved);
-+ g_free (resolved);
- #ifdef DEBUG
-- printf ("/proc/mounts: device %s -> %s \n", entry, resolved);
-+ printf ("/proc/mounts: device %s -> %s \n", entry, rspecial);
- #endif
-- if (strcmp (device, resolved) == 0) {
-- printf ("%s (-> %s) found in mount list. Not mounting.\n", entry, resolved);
-+ if (strcmp (device, rspecial) == 0) {
-+ printf ("%s (-> %s) found in mount list. Not mounting.\n", entry, rspecial);
- ret = TRUE;
- }
-
-- g_free (resolved);
-+ g_free (rspecial);
- }
- mtab_close (handle);
- return ret;
diff --git a/sysutils/hal/files/patch-tools_hal-storage-shared.c b/sysutils/hal/files/patch-tools_hal-storage-shared.c
deleted file mode 100644
index 1ed7fe907..000000000
--- a/sysutils/hal/files/patch-tools_hal-storage-shared.c
+++ /dev/null
@@ -1,45 +0,0 @@
---- tools/hal-storage-shared.c.orig 2008-05-07 19:24:24.000000000 -0400
-+++ tools/hal-storage-shared.c 2008-10-20 14:53:35.000000000 -0400
-@@ -297,6 +297,9 @@ handle_unmount (LibHalContext *hal_ctx,
- char *mount_point_to_unmount;
- gboolean mounted_by_other_uid;
- FILE *hal_mtab_new;
-+#ifdef __FreeBSD__
-+ char *rdevice = NULL;
-+#endif
-
- #ifdef DEBUG
- printf ("device = %s\n", device);
-@@ -473,7 +476,20 @@ line_found:
- #endif
- if (option_force)
- args[na++] = "-f";
-- args[na++] = (char *) device;
-+#ifdef __FreeBSD__
-+ dbus_error_init (&error);
-+ if (libhal_device_property_exists (hal_ctx, udi, "volume.freebsd.real_mounted_device", NULL)) {
-+ rdevice = libhal_device_get_property_string (hal_ctx, udi, "volume.freebsd.real_mounted_device", &error);
-+ if (dbus_error_is_set (&error)) {
-+ dbus_error_free (&error);
-+ unknown_error ("Error while getting volume.freebsd.real_mounted_device");
-+ }
-+ }
-+ if (rdevice)
-+ args[na++] = rdevice;
-+ else
-+#endif
-+ args[na++] = (char *) device;
- args[na++] = NULL;
-
- #ifdef DEBUG
-@@ -497,6 +513,10 @@ line_found:
- unknown_error ("Cannot spawn " UMOUNT);
- }
-
-+#ifdef __FreeBSD__
-+ g_free (rdevice);
-+#endif
-+
- /* check if unmount was succesful */
- if (exit_status != 0) {
- printf ("%s error %d, stdout='%s', stderr='%s'\n", UMOUNT, exit_status, sout, serr);
diff --git a/sysutils/hal/files/pkg-deinstall.in b/sysutils/hal/files/pkg-deinstall.in
deleted file mode 100644
index 4650d60fe..000000000
--- a/sysutils/hal/files/pkg-deinstall.in
+++ /dev/null
@@ -1,17 +0,0 @@
-#!/bin/sh
-
-[ "$2" != DEINSTALL ] && exit 0
-
-USER=haldaemon
-
-%%LOCALBASE%%/bin/polkit-auth --user ${USER} --revoke \
- org.freedesktop.policykit.read
-
-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 253eef1f0..000000000
--- a/sysutils/hal/files/pkg-install.in
+++ /dev/null
@@ -1,25 +0,0 @@
-#!/bin/sh
-
-case $2 in
-POST-INSTALL)
- USER=haldaemon
- GROUP=${USER}
-
- /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
- %%LOCALBASE%%/bin/polkit-auth --user ${USER} --grant \
- org.freedesktop.policykit.read
-
- 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
- exit 0
- ;;
-esac
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 0f42ef11f..000000000
--- a/sysutils/hal/pkg-plist
+++ /dev/null
@@ -1,134 +0,0 @@
-@unexec %D/etc/rc.d/hald stop > /dev/null 2>&1 || true
-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-mouse-sysmouse
-libexec/hald-addon-storage
-libexec/hald-generate-fdi-cache
-libexec/hald-probe-hiddev
-libexec/hald-probe-mouse
-libexec/hald-probe-scsi
-libexec/hald-probe-smbios
-libexec/hald-probe-storage
-%%USB2%%libexec/hald-probe-usb2-device
-%%USB2%%libexec/hald-probe-usb2-interface
-libexec/hald-probe-volume
-libexec/hald-runner
-sbin/hald
-%%PORTDOCS%%%%DOCSDIR%%/README.freebsd
-%%PORTDOCS%%%%DOCSDIR%%/README.fuse
-%%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-leds.fdi
-%%DATADIR%%/fdi/policy/10osvendor/10-mouse-sysmouse.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
-%%DATADIR%%/mount-fuse
-share/PolicyKit/policy/org.freedesktop.hal.dockstation.policy
-share/PolicyKit/policy/org.freedesktop.hal.killswitch.policy
-share/PolicyKit/policy/org.freedesktop.hal.leds.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/10osvendor
-@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
diff --git a/sysutils/nautilus-cd-burner/Makefile b/sysutils/nautilus-cd-burner/Makefile
deleted file mode 100644
index 83ea5687c..000000000
--- a/sysutils/nautilus-cd-burner/Makefile
+++ /dev/null
@@ -1,56 +0,0 @@
-# New ports collection makefile for: nautilus-cd-burner
-# Date created: 13 April 2003
-# Whom: Joe Marcus Clarke <marcus@FreeBSD.org>
-#
-# $FreeBSD$
-# $MCom$
-#
-
-PORTNAME= nautilus-cd-burner
-PORTVERSION= 2.24.0
-PORTREVISION= 3
-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_GMAKE= yes
-GNOME_DESKTOP_VERSION=2
-USE_GNOME= gnomeprefix gnomehack intlhack nautilus2 ltverhack \
- desktopfileutils ltasneededhack eel2 libgnomeui
-USE_CDRTOOLS= yes
-INSTALLS_ICONS= yes
-USE_AUTOTOOLS= libtool:22
-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 c4bc507dd..000000000
--- a/sysutils/nautilus-cd-burner/distinfo
+++ /dev/null
@@ -1,3 +0,0 @@
-MD5 (gnome2/nautilus-cd-burner-2.24.0.tar.bz2) = eb211dd03d0518263fa4eadccc3caa88
-SHA256 (gnome2/nautilus-cd-burner-2.24.0.tar.bz2) = d4ff952115a2fca28c613ce6a2b46740ce1000b0c213c482bcf3f127ceab99ad
-SIZE (gnome2/nautilus-cd-burner-2.24.0.tar.bz2) = 725247
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 867ac3603..000000000
--- a/sysutils/nautilus-cd-burner/pkg-plist
+++ /dev/null
@@ -1,148 +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@latin/LC_MESSAGES/nautilus-cd-burner.mo
-share/locale/sv/LC_MESSAGES/nautilus-cd-burner.mo
-share/locale/ta/LC_MESSAGES/nautilus-cd-burner.mo
-share/locale/te/LC_MESSAGES/nautilus-cd-burner.mo
-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/sr@latin/LC_MESSAGES
-@dirrmtry share/locale/sr@latin
-@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 b17c29646..000000000
--- a/sysutils/pessulus/Makefile
+++ /dev/null
@@ -1,39 +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.23 2009/07/29 10:16:46 kwm Exp $
-#
-
-PORTNAME= pessulus
-PORTVERSION= 2.28.0
-CATEGORIES= sysutils gnome
-MASTER_SITES= GNOME
-DIST_SUBDIR= gnome2
-
-MAINTAINER= gnome@FreeBSD.org
-COMMENT= A lockdown editor for GNOME
-
-USE_GMAKE= yes
-USE_BZIP2= yes
-USE_GNOME= gnomehack gnomeprefix intlhack pygnome2 pygnomedesktop
-WANT_GNOME= yes
-USE_PYTHON= yes
-USE_GETTEXT= 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 8ab858b7b..000000000
--- a/sysutils/pessulus/distinfo
+++ /dev/null
@@ -1,3 +0,0 @@
-MD5 (gnome2/pessulus-2.28.0.tar.bz2) = 792485aac615a8f36f7d77bc06a40036
-SHA256 (gnome2/pessulus-2.28.0.tar.bz2) = f6efb78f234f8fa5c2d1310e13340ec46d49c22d6de710daeb5136e75ff1a012
-SIZE (gnome2/pessulus-2.28.0.tar.bz2) = 178550
diff --git a/sysutils/pessulus/files/patch-data_Makefile.in b/sysutils/pessulus/files/patch-data_Makefile.in
deleted file mode 100644
index e6233c448..000000000
--- a/sysutils/pessulus/files/patch-data_Makefile.in
+++ /dev/null
@@ -1,11 +0,0 @@
---- data/Makefile.in.orig 2008-09-22 12:27:32.000000000 +0200
-+++ data/Makefile.in 2008-09-22 12:27:59.000000000 +0200
-@@ -422,7 +422,7 @@ uninstall-am: uninstall-desktopDATA unin
- @INTLTOOL_DESKTOP_RULE@
-
- install-icons:
-- for size in 16x16 22x22 24x24 32x32 48x48 scalable; do mkdir --parents $(DESTDIR)/$(datadir)/icons/hicolor/$$size/apps; done
-+ for size in 16x16 22x22 24x24 32x32 48x48 scalable; do mkdir -p $(DESTDIR)/$(datadir)/icons/hicolor/$$size/apps; done
-
- install -m 644 $(srcdir)/pessulus-16.png $(DESTDIR)/$(datadir)/icons/hicolor/16x16/apps/pessulus.png
- install -m 644 $(srcdir)/pessulus-22.png $(DESTDIR)/$(datadir)/icons/hicolor/22x22/apps/pessulus.png
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 f8034c268..000000000
--- a/sysutils/pessulus/pkg-plist
+++ /dev/null
@@ -1,174 +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
-share/icons/hicolor/16x16/apps/pessulus.png
-share/icons/hicolor/22x22/apps/pessulus.png
-share/icons/hicolor/24x24/apps/pessulus.png
-share/icons/hicolor/32x32/apps/pessulus.png
-share/icons/hicolor/48x48/apps/pessulus.png
-share/icons/hicolor/scalable/apps/pessulus.svg
-%%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/ast/LC_MESSAGES/pessulus.mo
-share/locale/bal/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/br/LC_MESSAGES/pessulus.mo
-share/locale/ca/LC_MESSAGES/pessulus.mo
-share/locale/ca@valencia/LC_MESSAGES/pessulus.mo
-share/locale/crh/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/kn/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/mai/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/nds/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/ps/LC_MESSAGES/pessulus.mo
-share/locale/pt/LC_MESSAGES/pessulus.mo
-share/locale/pt_BR/LC_MESSAGES/pessulus.mo
-share/locale/ro/LC_MESSAGES/pessulus.mo
-share/locale/ru/LC_MESSAGES/pessulus.mo
-share/locale/si/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@latin/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%%/ui/pessulus.ui
-@dirrm %%DATADIR%%/ui
-@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/sr@latin/LC_MESSAGES
-@dirrmtry share/locale/sr@latin
-@dirrmtry share/locale/si/LC_MESSAGES
-@dirrmtry share/locale/si
-@dirrmtry share/locale/ps/LC_MESSAGES
-@dirrmtry share/locale/ps
-@dirrmtry share/locale/oc/LC_MESSAGES
-@dirrmtry share/locale/oc
-@dirrmtry share/locale/nds/LC_MESSAGES
-@dirrmtry share/locale/nds
-@dirrmtry share/locale/mr/LC_MESSAGES
-@dirrmtry share/locale/mr
-@dirrmtry share/locale/mai/LC_MESSAGES
-@dirrmtry share/locale/mai
-@dirrmtry share/locale/ku/LC_MESSAGES
-@dirrmtry share/locale/ku
-@dirrmtry share/locale/dz/LC_MESSAGES
-@dirrmtry share/locale/dz
-@dirrmtry share/locale/crh/LC_MESSAGES
-@dirrmtry share/locale/crh
-@dirrmtry share/locale/ca@valencia/LC_MESSAGES
-@dirrmtry share/locale/ca@valencia
-@dirrmtry share/locale/br/LC_MESSAGES
-@dirrmtry share/locale/br
-@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/bal/LC_MESSAGES
-@dirrmtry share/locale/bal
-@dirrmtry share/locale/ast/LC_MESSAGES
-@dirrmtry share/locale/ast
-@dirrmtry share/locale/as/LC_MESSAGES
-@dirrmtry share/locale/as
diff --git a/sysutils/polkit-gnome/Makefile b/sysutils/polkit-gnome/Makefile
deleted file mode 100644
index 7e82babc4..000000000
--- a/sysutils/polkit-gnome/Makefile
+++ /dev/null
@@ -1,32 +0,0 @@
-# New ports collection makefile for: polkit-gnome
-# Date Created: 30 Juli 2009
-# Whom: Koop Mast<kwm@FreeBSD.org>
-#
-# $FreeBSD$
-# $MCom: ports/sysutils/polkit-gnome/Makefile,v 1.4 2009/09/13 16:28:31 marcus Exp $
-#
-
-PORTNAME= polkit-gnome
-PORTVERSION= 0.95
-CATEGORIES= sysutils gnome
-MASTER_SITES= http://hal.freedesktop.org/releases/
-
-MAINTAINER= gnome@FreeBSD.org
-COMMENT= GNOME frontend to the PolicKit framework
-
-BUILD_DEPENDS= ${LOCALBASE}/share/gir-1.0/Gtk-2.0.gir:${PORTSDIR}/x11-toolkits/gir-repository-gtk20
-LIB_DEPENDS= polkit-gobject-1.0:${PORTSDIR}/sysutils/polkit
-RUN_DEPENDS= ${LOCALBASE}/share/gir-1.0/Gtk-2.0.gir:${PORTSDIR}/x11-toolkits/gir-repository-gtk20
-
-USE_BZIP2= yes
-USE_GMAKE= yes
-USE_GETTEXT= yes
-USE_GNOME= gnomehack gnomeprefix gtk20 intlhack
-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/polkit-gnome/distinfo b/sysutils/polkit-gnome/distinfo
deleted file mode 100644
index e43e18c8c..000000000
--- a/sysutils/polkit-gnome/distinfo
+++ /dev/null
@@ -1,3 +0,0 @@
-MD5 (polkit-gnome-0.95.tar.bz2) = e52555258ebae5d3f080b7b4cd6aedd4
-SHA256 (polkit-gnome-0.95.tar.bz2) = 3ee6bfe7475856f2287736d7174bbe4199ca32d803e23e1ce653434e1ba56c06
-SIZE (polkit-gnome-0.95.tar.bz2) = 361305
diff --git a/sysutils/polkit-gnome/pkg-descr b/sysutils/polkit-gnome/pkg-descr
deleted file mode 100644
index 57dad7b5d..000000000
--- a/sysutils/polkit-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/wiki/Software/PolicyKit
diff --git a/sysutils/polkit-gnome/pkg-plist b/sysutils/polkit-gnome/pkg-plist
deleted file mode 100644
index bfa353ff1..000000000
--- a/sysutils/polkit-gnome/pkg-plist
+++ /dev/null
@@ -1,66 +0,0 @@
-etc/xdg/autostart/polkit-gnome-authentication-agent-1.desktop
-include/polkit-gtk-1/polkitgtk/polkitgtk.h
-include/polkit-gtk-1/polkitgtk/polkitgtktypes.h
-include/polkit-gtk-1/polkitgtk/polkitlockbutton.h
-lib/girepository-1.0/PolkitGtk-1.0.typelib
-lib/libpolkit-gtk-1.a
-lib/libpolkit-gtk-1.la
-lib/libpolkit-gtk-1.so
-lib/libpolkit-gtk-1.so.0
-libexec/polkit-gnome-authentication-agent-1
-libdata/pkgconfig/polkit-gtk-1.pc
-share/gir-1.0/PolkitGtk-1.0.gir
-share/locale/ar/LC_MESSAGES/polkit-gnome-1.mo
-share/locale/be/LC_MESSAGES/polkit-gnome-1.mo
-share/locale/ca/LC_MESSAGES/polkit-gnome-1.mo
-share/locale/cs/LC_MESSAGES/polkit-gnome-1.mo
-share/locale/da/LC_MESSAGES/polkit-gnome-1.mo
-share/locale/de/LC_MESSAGES/polkit-gnome-1.mo
-share/locale/el/LC_MESSAGES/polkit-gnome-1.mo
-share/locale/en_GB/LC_MESSAGES/polkit-gnome-1.mo
-share/locale/es/LC_MESSAGES/polkit-gnome-1.mo
-share/locale/eu/LC_MESSAGES/polkit-gnome-1.mo
-share/locale/fi/LC_MESSAGES/polkit-gnome-1.mo
-share/locale/fr/LC_MESSAGES/polkit-gnome-1.mo
-share/locale/gl/LC_MESSAGES/polkit-gnome-1.mo
-share/locale/gu/LC_MESSAGES/polkit-gnome-1.mo
-share/locale/he/LC_MESSAGES/polkit-gnome-1.mo
-share/locale/hu/LC_MESSAGES/polkit-gnome-1.mo
-share/locale/it/LC_MESSAGES/polkit-gnome-1.mo
-share/locale/ja/LC_MESSAGES/polkit-gnome-1.mo
-share/locale/lt/LC_MESSAGES/polkit-gnome-1.mo
-share/locale/nb/LC_MESSAGES/polkit-gnome-1.mo
-share/locale/pa/LC_MESSAGES/polkit-gnome-1.mo
-share/locale/pl/LC_MESSAGES/polkit-gnome-1.mo
-share/locale/pt/LC_MESSAGES/polkit-gnome-1.mo
-share/locale/pt_BR/LC_MESSAGES/polkit-gnome-1.mo
-share/locale/ru/LC_MESSAGES/polkit-gnome-1.mo
-share/locale/sk/LC_MESSAGES/polkit-gnome-1.mo
-share/locale/sv/LC_MESSAGES/polkit-gnome-1.mo
-share/locale/zh_CN/LC_MESSAGES/polkit-gnome-1.mo
-share/locale/zh_HK/LC_MESSAGES/polkit-gnome-1.mo
-share/locale/zh_TW/LC_MESSAGES/polkit-gnome-1.mo
-@dirrmtry share/locale/zh_TW/LC_MESSAGES
-@dirrmtry share/locale/zh_TW
-@dirrmtry share/locale/zh_HK/LC_MESSAGES
-@dirrmtry share/locale/zh_HK
-@dirrmtry share/locale/zh_CN/LC_MESSAGES
-@dirrmtry share/locale/zh_CN
-@dirrmtry share/locale/sk/LC_MESSAGES
-@dirrmtry share/locale/sk
-@dirrmtry share/locale/pt/LC_MESSAGES
-@dirrmtry share/locale/pt
-@dirrmtry share/locale/pl/LC_MESSAGES
-@dirrmtry share/locale/pl
-@dirrmtry share/locale/fi/LC_MESSAGES
-@dirrmtry share/locale/fi
-@dirrmtry share/locale/el/LC_MESSAGES
-@dirrmtry share/locale/el
-@dirrmtry share/locale/cs/LC_MESSAGES
-@dirrmtry share/locale/cs
-@dirrmtry share/locale/ca/LC_MESSAGES
-@dirrmtry share/locale/ca
-@dirrmtry share/locale/be/LC_MESSAGES
-@dirrmtry share/locale/be
-@dirrm include/polkit-gtk-1/polkitgtk
-@dirrm include/polkit-gtk-1
diff --git a/sysutils/polkit/Makefile b/sysutils/polkit/Makefile
deleted file mode 100644
index a0ba88aa6..000000000
--- a/sysutils/polkit/Makefile
+++ /dev/null
@@ -1,66 +0,0 @@
-# New ports collection makefile for: polkit
-# Date Created: 30 Juli 2009
-# Whom: Koop Mast<kwm@FreeBSD.org>
-#
-# $FreeBSD$
-# $MCom: ports/sysutils/polkit/Makefile,v 1.4 2009/11/24 02:17:33 marcus Exp $
-#
-
-PORTNAME= polkit
-PORTVERSION= 0.95
-PORTREVISION= 1
-CATEGORIES= sysutils gnome
-MASTER_SITES= http://hal.freedesktop.org/releases/
-
-MAINTAINER= gnome@FreeBSD.org
-COMMENT= Framework for controlling access to system-wide components
-
-BUILD_DEPENDS= ${LOCALBASE}/share/gir-1.0/GLib-2.0.gir:${PORTSDIR}/devel/gobject-introspection
-LIB_DEPENDS= eggdbus-1.0:${PORTSDIR}/devel/eggdbus \
- expat.6:${PORTSDIR}/textproc/expat2
-RUN_DEPENDS= ${LOCALBASE}/share/gir-1.0/GLib-2.0.gir:${PORTSDIR}/devel/gobject-introspection
-
-USE_GNOME= gnomehack glib20 intlhack
-USE_GMAKE= yes
-USE_GETTEXT= yes
-GNU_CONFIGURE= yes
-USE_LDCONFIG= yes
-CONFIGURE_ARGS= --disable-gtk-doc \
- --with-authfw=pam \
- --with-pam-include=system \
- --with-os-type=freebsd \
- --enable-introspection \
- --localstatedir=/var \
-CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \
- LDFLAGS="-L${LOCALBASE}/lib" \
- GTKDOC="false"
-
-.if defined(NO_INSTALL_MANPAGES)
-CONFIGURE_ARGS+=--disable-man-pages
-.else
-BUILD_DEPENDS+= ${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
-
-MAN1= pkaction.1 pkcheck.1 pkexec.1
-MAN8= pklocalauthority.8 polkit.8 polkitd.8
-.endif
-
-post-patch:
- @${REINPLACE_CMD} -e 's|/usr/bin/|${PREFIX}/bin/|g' \
- ${WRKSRC}/docs/man/pkexec.xml \
- ${WRKSRC}/src/examples/org.freedesktop.policykit.examples.pkexec.policy.in
-
-post-install:
- ${MKDIR} ${PREFIX}/etc/dbus-1/system.d/
- if [ ! -f ${PREFIX}/etc/dbus-1/system.d/org.freedesktop.PolicyKit1.conf ]; then \
- ${INSTALL_DATA} ${WRKSRC}/data/org.freedesktop.PolicyKit1.conf \
- ${PREFIX}/etc/dbus-1/system.d/org.freedesktop.PolicyKit1.conf ; \
- fi
- ${INSTALL_DATA} ${WRKSRC}/data/org.freedesktop.PolicyKit1.conf \
- ${PREFIX}/etc/dbus-1/system.d/org.freedesktop.PolicyKit1.conf.dist
-.if !defined(PACKAGE_BUILDING)
- @${SETENV} PKG_PREFIX=${PREFIX} ${SH} ${PKGINSTALL} ${PKGNAME} POST-INSTALL
-.endif
-
-.include <bsd.port.mk>
diff --git a/sysutils/polkit/distinfo b/sysutils/polkit/distinfo
deleted file mode 100644
index b37677cf9..000000000
--- a/sysutils/polkit/distinfo
+++ /dev/null
@@ -1,3 +0,0 @@
-MD5 (polkit-0.95.tar.gz) = 10971f5d334550025897b02d779fddd1
-SHA256 (polkit-0.95.tar.gz) = b484248ed8fa7419170cf98d7cba51d68290783c3c7cac7c5dab7605dfe3c79c
-SIZE (polkit-0.95.tar.gz) = 1025805
diff --git a/sysutils/polkit/files/patch-data_Makefile.in b/sysutils/polkit/files/patch-data_Makefile.in
deleted file mode 100644
index c2895461f..000000000
--- a/sysutils/polkit/files/patch-data_Makefile.in
+++ /dev/null
@@ -1,11 +0,0 @@
---- data/Makefile.in.orig 2009-08-01 16:02:38.000000000 +0200
-+++ data/Makefile.in 2009-08-01 16:05:13.000000000 +0200
-@@ -471,7 +471,7 @@
-
- info-am:
-
--install-data-am: install-dbusconfDATA install-pamDATA \
-+install-data-am: install-pamDATA \
- install-pkgconfigDATA install-serviceDATA
-
- install-dvi: install-dvi-am
diff --git a/sysutils/polkit/files/patch-src_polkitbackend_Makefile.in b/sysutils/polkit/files/patch-src_polkitbackend_Makefile.in
deleted file mode 100644
index b3bb5b721..000000000
--- a/sysutils/polkit/files/patch-src_polkitbackend_Makefile.in
+++ /dev/null
@@ -1,15 +0,0 @@
---- src/polkitbackend/Makefile.in.orig 2009-08-01 11:56:22.000000000 +0200
-+++ src/polkitbackend/Makefile.in 2009-08-01 11:57:18.000000000 +0200
-@@ -852,7 +852,11 @@ clean-local :
-
- install-exec-hook:
- mkdir -p $(DESTDIR)$(localstatedir)/lib/polkit-1
-- mkdir -p $(DESTDIR)$(localstatedir)/lib/polkit-1/localauthority/{10-vendor.d,20-org.d,30-site.d,50-local.d,90-mandatory.d}
-+ mkdir -p $(DESTDIR)$(localstatedir)/lib/polkit-1/localauthority/10-vendor.d
-+ mkdir -p $(DESTDIR)$(localstatedir)/lib/polkit-1/localauthority/20-org.d
-+ mkdir -p $(DESTDIR)$(localstatedir)/lib/polkit-1/localauthority/30-site.d
-+ mkdir -p $(DESTDIR)$(localstatedir)/lib/polkit-1/localauthority/50-local.d
-+ mkdir -p $(DESTDIR)$(localstatedir)/lib/polkit-1/localauthority/90-mandatory.d
- -chmod 700 $(DESTDIR)$(localstatedir)/lib/polkit-1
- mkdir -p $(DESTDIR)$(libdir)/polkit-1/extensions
-
diff --git a/sysutils/polkit/pkg-descr b/sysutils/polkit/pkg-descr
deleted file mode 100644
index 9746a6470..000000000
--- a/sysutils/polkit/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/wiki/Software/PolicyKit
diff --git a/sysutils/polkit/pkg-install b/sysutils/polkit/pkg-install
deleted file mode 100644
index 93efeea22..000000000
--- a/sysutils/polkit/pkg-install
+++ /dev/null
@@ -1,12 +0,0 @@
-#!/bin/sh
-
-case $2 in
-POST-INSTALL)
- mkdir -p /var/lib/polkit-1
- for i in 10-vendor.d 20-org.d 30-site.d 50-local.d 90-mandatory.d; do
- mkdir -p /var/lib/polkit-1/${i}
- done
- chmod 0700 /var/lib/polkit-1
- exit 0
- ;;
-esac
diff --git a/sysutils/polkit/pkg-plist b/sysutils/polkit/pkg-plist
deleted file mode 100644
index 2685cac96..000000000
--- a/sysutils/polkit/pkg-plist
+++ /dev/null
@@ -1,82 +0,0 @@
-bin/pkaction
-bin/pkcheck
-bin/pkexec
-@unexec if cmp -s %D/etc/dbus-1/system.d/org.freedesktop.PolicyKit1.conf %D/etc/dbus-1/system.d/org.freedesktop.PolicyKit1.conf.dist; then rm -f %D/etc/dbus-1/system.d/org.freedesktop.PolicyKit1.conf ; fi
-etc/dbus-1/system.d/org.freedesktop.PolicyKit1.conf.dist
-@exec [ -f %B/org.freedesktop.PolicyKit1.conf ] || cp %B/%f %B/org.freedesktop.PolicyKit1.conf
-etc/pam.d/polkit-1
-etc/polkit-1/localauthority.conf.d/50-localauthority.conf
-etc/polkit-1/nullbackend.conf.d/50-nullbackend.conf
-include/polkit-1/polkit/polkit.h
-include/polkit-1/polkit/polkitactiondescription.h
-include/polkit-1/polkit/polkitauthorityfeatures.h
-include/polkit-1/polkit/polkitauthority.h
-include/polkit-1/polkit/polkitauthorizationresult.h
-include/polkit-1/polkit/polkitcheckauthorizationflags.h
-include/polkit-1/polkit/polkitdetails.h
-include/polkit-1/polkit/polkitenumtypes.h
-include/polkit-1/polkit/polkiterror.h
-include/polkit-1/polkit/polkitidentity.h
-include/polkit-1/polkit/polkitimplicitauthorization.h
-include/polkit-1/polkit/polkitprivate.h
-include/polkit-1/polkit/polkitsubject.h
-include/polkit-1/polkit/polkitsystembusname.h
-include/polkit-1/polkit/polkittemporaryauthorization.h
-include/polkit-1/polkit/polkittypes.h
-include/polkit-1/polkit/polkitunixgroup.h
-include/polkit-1/polkit/polkitunixprocess.h
-include/polkit-1/polkit/polkitunixsession.h
-include/polkit-1/polkit/polkitunixuser.h
-include/polkit-1/polkitagent/polkitagent.h
-include/polkit-1/polkitagent/polkitagentlistener.h
-include/polkit-1/polkitagent/polkitagentsession.h
-include/polkit-1/polkitagent/polkitagenttypes.h
-include/polkit-1/polkitbackend/polkitbackend.h
-include/polkit-1/polkitbackend/polkitbackendactionlookup.h
-include/polkit-1/polkitbackend/polkitbackendactionpool.h
-include/polkit-1/polkitbackend/polkitbackendauthority.h
-include/polkit-1/polkitbackend/polkitbackendconfigsource.h
-include/polkit-1/polkitbackend/polkitbackendinteractiveauthority.h
-include/polkit-1/polkitbackend/polkitbackendlocalauthority.h
-include/polkit-1/polkitbackend/polkitbackendlocalauthorizationstore.h
-include/polkit-1/polkitbackend/polkitbackendsessionmonitor.h
-include/polkit-1/polkitbackend/polkitbackendtypes.h
-lib/girepository-1.0/Polkit-1.0.typelib
-lib/libpolkit-agent-1.a
-lib/libpolkit-agent-1.la
-lib/libpolkit-agent-1.so
-lib/libpolkit-agent-1.so.0
-lib/libpolkit-backend-1.a
-lib/libpolkit-backend-1.la
-lib/libpolkit-backend-1.so
-lib/libpolkit-backend-1.so.0
-lib/libpolkit-gobject-1.a
-lib/libpolkit-gobject-1.la
-lib/libpolkit-gobject-1.so
-lib/libpolkit-gobject-1.so.0
-lib/polkit-1/extensions/libnullbackend.a
-lib/polkit-1/extensions/libnullbackend.la
-lib/polkit-1/extensions/libnullbackend.so
-lib/polkit-1/extensions/libpkexec-action-lookup.a
-lib/polkit-1/extensions/libpkexec-action-lookup.la
-lib/polkit-1/extensions/libpkexec-action-lookup.so
-libdata/pkgconfig/polkit-agent-1.pc
-libdata/pkgconfig/polkit-backend-1.pc
-libdata/pkgconfig/polkit-gobject-1.pc
-libexec/polkit-agent-helper-1
-libexec/polkitd
-share/dbus-1/system-services/org.freedesktop.PolicyKit1.service
-share/gir-1.0/Polkit-1.0.gir
-share/locale/da/LC_MESSAGES/polkit-1.mo
-share/polkit-1/actions/org.freedesktop.policykit.policy
-@dirrmtry share/polkit-1/actions
-@dirrmtry share/polkit-1
-@dirrm lib/polkit-1/extensions
-@dirrm lib/polkit-1
-@dirrm include/polkit-1/polkitbackend
-@dirrm include/polkit-1/polkitagent
-@dirrm include/polkit-1/polkit
-@dirrm include/polkit-1
-@dirrm etc/polkit-1/nullbackend.conf.d
-@dirrm etc/polkit-1/localauthority.conf.d
-@dirrm etc/polkit-1
diff --git a/sysutils/system-tools-backends/Makefile b/sysutils/system-tools-backends/Makefile
deleted file mode 100644
index 3ff81e0f5..000000000
--- a/sysutils/system-tools-backends/Makefile
+++ /dev/null
@@ -1,38 +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.53 2009/08/20 08:31:11 kwm Exp $
-#
-
-PORTNAME= system-tools-backends
-PORTVERSION= 2.8.2
-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-gobject-1.0:${PORTSDIR}/sysutils/polkit
-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"
-
-post-configure:
- @${REINPLACE_CMD} -e 's|@GETTEXT_PACKAGE@|system-tools-backends|g' \
- ${WRKSRC}/po/Makefile
-
-.include <bsd.port.mk>
diff --git a/sysutils/system-tools-backends/distinfo b/sysutils/system-tools-backends/distinfo
deleted file mode 100644
index d5b28d398..000000000
--- a/sysutils/system-tools-backends/distinfo
+++ /dev/null
@@ -1,3 +0,0 @@
-MD5 (gnome2/system-tools-backends-2.8.2.tar.bz2) = 689c79b36d2929b264c29ff39db4b10b
-SHA256 (gnome2/system-tools-backends-2.8.2.tar.bz2) = bbbef8a0d160c6dfd44d60a5026a6c51ac97818d18febcf716e218983af4bf6c
-SIZE (gnome2/system-tools-backends-2.8.2.tar.bz2) = 458579
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 909f28dff..000000000
--- a/sysutils/system-tools-backends/files/patch-Users_Users.pm
+++ /dev/null
@@ -1,47 +0,0 @@
---- Users/Users.pm.orig 2009-09-28 05:49:10.000000000 -0400
-+++ Users/Users.pm 2009-10-11 15:09:31.000000000 -0400
-@@ -443,7 +443,7 @@ sub del_user
-
- if ($Utils::Backend::tool{"system"} eq "FreeBSD")
- {
-- @command = ($cmd_pw, "userdel", "-n", $$user[$LOGIN]);
-+ @command = ($cmd_pw, "userdel", "-n", $$user[$LOGIN], "-r");
- }
- else
- {
-@@ -551,9 +551,7 @@ sub add_user
- my $pwdpipe;
- my $home;
-
-- # FreeBSD doesn't create the home directory
- $home = $$user[$HOME];
-- &Utils::File::run ($tool_mkdir, "-p", $home);
-
- $command = "$cmd_pw useradd " .
- " -n \'" . $$user[$LOGIN] . "\'" .
-@@ -561,7 +559,7 @@ sub add_user
- " -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
-
- # @command = ($cmd_pw, "useradd", "-n", $$user[$LOGIN],
- # "-u", $$user[$UID],
-@@ -573,6 +571,7 @@ sub add_user
- $pwdpipe = &Utils::File::run_pipe_write ($command);
- print $pwdpipe $$user[$PASSWD];
- &Utils::File::close_file ($pwdpipe);
-+ &Utils::File::run ("chown -R " . $$user[$LOGIN] . " $home");
- }
- elsif ($Utils::Backend::tool{"system"} eq "SunOS")
- {
-@@ -651,7 +650,7 @@ sub change_user
- " -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 d21e2c24e..000000000
--- a/sysutils/system-tools-backends/files/patch-dispatcher_main.c
+++ /dev/null
@@ -1,11 +0,0 @@
---- dispatcher/main.c.orig 2009-03-17 02:57:49.000000000 +0100
-+++ dispatcher/main.c 2009-04-16 10:05:33.000000000 +0200
-@@ -48,7 +48,7 @@ daemonize (void)
- setsid ();
-
- if ((pidfile_fd = open (LOCALSTATEDIR "/run/system-tools-backends.pid",
-- O_CREAT | O_WRONLY,
-+ O_CREAT | O_WRONLY, 0600,
- S_IRUSR | S_IWUSR | S_IRGRP | S_IROTH)) != -1)
- {
- str = g_strdup_printf ("%d", getpid ());
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 b300daf2d..000000000
--- a/sysutils/system-tools-backends/pkg-plist
+++ /dev/null
@@ -1,132 +0,0 @@
-etc/dbus-1/system.d/org.freedesktop.SystemToolsBackends.conf
-sbin/system-tools-backends
-libdata/pkgconfig/system-tools-backends-2.0.pc
-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/locale/ar/LC_MESSAGES/system-tools-backends.mo
-share/locale/bg/LC_MESSAGES/system-tools-backends.mo
-share/locale/bn_IN/LC_MESSAGES/system-tools-backends.mo
-share/locale/ca/LC_MESSAGES/system-tools-backends.mo
-share/locale/cs/LC_MESSAGES/system-tools-backends.mo
-share/locale/da/LC_MESSAGES/system-tools-backends.mo
-share/locale/de/LC_MESSAGES/system-tools-backends.mo
-share/locale/el/LC_MESSAGES/system-tools-backends.mo
-share/locale/en_GB/LC_MESSAGES/system-tools-backends.mo
-share/locale/es/LC_MESSAGES/system-tools-backends.mo
-share/locale/et/LC_MESSAGES/system-tools-backends.mo
-share/locale/eu/LC_MESSAGES/system-tools-backends.mo
-share/locale/fi/LC_MESSAGES/system-tools-backends.mo
-share/locale/fr/LC_MESSAGES/system-tools-backends.mo
-share/locale/gl/LC_MESSAGES/system-tools-backends.mo
-share/locale/gu/LC_MESSAGES/system-tools-backends.mo
-share/locale/he/LC_MESSAGES/system-tools-backends.mo
-share/locale/hi/LC_MESSAGES/system-tools-backends.mo
-share/locale/hu/LC_MESSAGES/system-tools-backends.mo
-share/locale/it/LC_MESSAGES/system-tools-backends.mo
-share/locale/ja/LC_MESSAGES/system-tools-backends.mo
-share/locale/kn/LC_MESSAGES/system-tools-backends.mo
-share/locale/or/LC_MESSAGES/system-tools-backends.mo
-share/locale/pa/LC_MESSAGES/system-tools-backends.mo
-share/locale/pl/LC_MESSAGES/system-tools-backends.mo
-share/locale/pt/LC_MESSAGES/system-tools-backends.mo
-share/locale/pt_BR/LC_MESSAGES/system-tools-backends.mo
-share/locale/ro/LC_MESSAGES/system-tools-backends.mo
-share/locale/sl/LC_MESSAGES/system-tools-backends.mo
-share/locale/sr/LC_MESSAGES/system-tools-backends.mo
-share/locale/sr@latin/LC_MESSAGES/system-tools-backends.mo
-share/locale/sv/LC_MESSAGES/system-tools-backends.mo
-share/locale/ta/LC_MESSAGES/system-tools-backends.mo
-share/locale/te/LC_MESSAGES/system-tools-backends.mo
-share/locale/th/LC_MESSAGES/system-tools-backends.mo
-share/locale/tr/LC_MESSAGES/system-tools-backends.mo
-share/locale/uk/LC_MESSAGES/system-tools-backends.mo
-share/locale/zh_CN/LC_MESSAGES/system-tools-backends.mo
-share/locale/zh_HK/LC_MESSAGES/system-tools-backends.mo
-share/locale/zh_TW/LC_MESSAGES/system-tools-backends.mo
-share/polkit-1/actions/org.freedesktop.SystemToolsBackends.policy
-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
-@dirrmtry share/locale/zh_TW/LC_MESSAGES
-@dirrmtry share/locale/zh_TW
-@dirrmtry share/locale/zh_HK/LC_MESSAGES
-@dirrmtry share/locale/zh_HK
-@dirrmtry share/locale/zh_CN/LC_MESSAGES
-@dirrmtry share/locale/zh_CN
-@dirrmtry share/locale/uk/LC_MESSAGES
-@dirrmtry share/locale/uk
-@dirrmtry share/locale/te/LC_MESSAGES
-@dirrmtry share/locale/te
-@dirrmtry share/locale/sr@latin/LC_MESSAGES
-@dirrmtry share/locale/sr@latin
-@dirrmtry share/locale/sl/LC_MESSAGES
-@dirrmtry share/locale/sl
-@dirrmtry share/locale/ro/LC_MESSAGES
-@dirrmtry share/locale/ro
-@dirrmtry share/locale/pl/LC_MESSAGES
-@dirrmtry share/locale/pl
-@dirrmtry share/locale/gl/LC_MESSAGES
-@dirrmtry share/locale/gl
-@dirrmtry share/locale/fi/LC_MESSAGES
-@dirrmtry share/locale/fi
-@dirrmtry share/locale/el/LC_MESSAGES
-@dirrmtry share/locale/el
-@dirrmtry share/locale/cs/LC_MESSAGES
-@dirrmtry share/locale/cs
-@dirrmtry share/locale/ca/LC_MESSAGES
-@dirrmtry share/locale/ca
-@dirrmtry share/locale/bn_IN/LC_MESSAGES
-@dirrmtry share/locale/bn_IN
diff --git a/sysutils/tracker-client/Makefile b/sysutils/tracker-client/Makefile
deleted file mode 100644
index 02d840c01..000000000
--- a/sysutils/tracker-client/Makefile
+++ /dev/null
@@ -1,120 +0,0 @@
-# New ports collection makefile for: tracker
-# Date created: 2006-12-09
-# Whom: Michael Johnson <ahze@FreeBSD.org>
-#
-# $FreeBSD$
-# $MCom: ports/sysutils/tracker-client/Makefile,v 1.9 2009/09/26 07:50:37 avl Exp $
-#
-
-PORTNAME= tracker
-PORTVERSION= 0.6.95
-PORTREVISION= 1
-CATEGORIES= sysutils gnome
-MASTER_SITES= GNOME
-PKGNAMESUFFIX?= -client
-
-MAINTAINER= gnome@FreeBSD.org
-COMMENT= Object database, tag/metadata database, search tool and indexer
-
-LIB_DEPENDS= sqlite3.8:${PORTSDIR}/databases/sqlite3 \
- dbus-glib-1.2:${PORTSDIR}/devel/dbus-glib \
- poppler-glib.4:${PORTSDIR}/graphics/poppler-gtk \
- exif.12:${PORTSDIR}/graphics/libexif \
- wv-1.2.3:${PORTSDIR}/textproc/wv \
- gmime-2.0.4:${PORTSDIR}/mail/gmime2 \
- qdbm.14:${PORTSDIR}/databases/qdbm \
- exempi.3:${PORTSDIR}/textproc/exempi \
- hal.1:${PORTSDIR}/sysutils/hal \
- totem-plparser.12:${PORTSDIR}/multimedia/totem-pl-parser \
- raptor.2:${PORTSDIR}/textproc/raptor \
- ogg.6:${PORTSDIR}/audio/libogg \
- iptcdata.3:${PORTSDIR}/graphics/libiptcdata
-RUN_DEPENDS= xdg-desktop-icon:${PORTSDIR}/devel/xdg-utils \
- o3totxt:${PORTSDIR}/converters/o3read \
- pdftotext:${PORTSDIR}/graphics/poppler-utils \
- w3m:${PORTSDIR}/www/w3m
-
-USE_BZIP2= yes
-USE_FAM= yes
-WANT_FAM_SYSTEM=gamin
-INSTALLS_ICONS= yes
-USE_GNOME= gnomehack gnomeprefix ltasneededhack intltool ltverhack
-USE_GMAKE= yes
-USE_GETTEXT= yes
-USE_LDCONFIG= yes
-USE_GSTREAMER= core
-INSTALLS_ICONS= yes
-USE_AUTOTOOLS= libtool:22
-CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \
- LDFLAGS="-L${LOCALBASE}/lib -L${LOCALBASE}/lib/tracker ${PTHREAD_LIBS}"
-CONFIGURE_ARGS= --enable-video-extractor=gstreamer \
- --enable-file-monitoring=fam \
- --with-session-bus-services-dir=${LOCALBASE}/share/dbus-1/services \
- --enable-external-qdbm --enable-libexif --enable-libvorbis \
- --enable-libiptcdata
-
-.include <bsd.port.pre.mk>
-
-.if defined(TRACKER_SLAVE)
-LIB_DEPENDS+= trackerclient:${PORTSDIR}/sysutils/tracker-client
-. if ${TRACKER_SLAVE}=="gnome"
-PKGNAMESUFFIX= -gnome
-LIB_DEPENDS+= tracker-gtk:${PORTSDIR}/sysutils/tracker-libtrackergtk
-BUILD_WRKSRC= ${WRKSRC}/src/tracker-applet
-INSTALL_WRKSRC= ${WRKSRC}/src/tracker-applet
-EXTRA_WRKSRC= src/tracker-preferences src/tracker-search-tool
-RUN_DEPENDS+= ${LOCALBASE}/lib/deskbar-applet/deskbar-applet:${PORTSDIR}/deskutils/deskbar-applet
-USE_GNOME+= gnomedesktop libgsf
-MAN1+= tracker-applet.1 tracker-search-tool.1 tracker-preferences.1
-CONFIGURE_ARGS+=--enable-deskbar-applet \
- --with-deskbar-applet-handler-dir=${LOCALBASE}/lib/deskbar-applet/handlers
-. endif
-. if defined(TRACKER_SLAVE) && ${TRACKER_SLAVE}=="libtrackergtk"
-PKGNAMESUFFIX= -libtrackergtk
-USE_GNOME+= libgsf
-BUILD_WRKSRC= ${WRKSRC}/src/libtracker-gtk
-INSTALL_WRKSRC= ${BUILD_WRKSRC}
-. endif
-.else
-MAN1+= tracker-extract.1 tracker-files.1 \
- tracker-info.1 \
- tracker-meta-folder.1 tracker-query.1 \
- tracker-search.1 tracker-services.1 tracker-stats.1 \
- tracker-status.1 tracker-tag.1 tracker-thumbnailer.1 tracker-unique.1 trackerd.1
-
-MAN5+= tracker.cfg.5
-CONFIGURE_ARGS+= --disable-libtrackergtk --disable-gui \
- --disable-trackerapplet --disable-gsf \
- --disable-preferences --disable-deskbar-applet \
- --disable-tracker-applet --disable-tracker-preferences \
- --disable-libgsf
-.endif
-
-post-patch:
- @${REINPLACE_CMD} -e 's|libpng|libpng12|' ${WRKSRC}/configure
-
-post-build:
-.if defined(TRACKER_SLAVE) && ${TRACKER_SLAVE}=="libtrackergtk"
- @(cd ${WRKSRC}/src/tracker-extract && ${MAKE} libextract-msoffice.la)
-.elif defined(TRACKER_SLAVE) && ${TRACKER_SLAVE}=="gnome"
-. for dir in ${EXTRA_WRKSRC}
- @(cd ${WRKSRC}/${dir}; ${SETENV} ${MAKE_ENV} ${GMAKE} ${MAKE_FLAGS} ${MAKEFILE} ${MAKE_ARGS} ${ALL_TARGET})
-. endfor
-.endif
-
-post-install:
-.if defined(TRACKER_SLAVE) && ${TRACKER_SLAVE}=="libtrackergtk"
- ${MKDIR} ${PREFIX}/lib/tracker/extract-modules
- @(cd ${WRKSRC}/src/tracker-extract && for f in .a .la .so ; \
- do ${INSTALL_DATA} .libs/libextract-msoffice$${f} \
- ${PREFIX}/lib/tracker/extract-modules ; done)
-.elif defined(TRACKER_SLAVE) && ${TRACKER_SLAVE}=="gnome"
-. for dir in ${EXTRA_WRKSRC}
- @(cd ${WRKSRC}/${dir} && ${SETENV} ${MAKE_ENV} ${GMAKE} ${MAKE_FLAGS} ${MAKEFILE} ${MAKE_ARGS} ${INSTALL_TARGET})
-. endfor
-. for man in ${MAN1}
- @(cd ${WRKSRC} && ${INSTALL_DATA} docs/manpages/${man} ${PREFIX}/man/man1/${man})
-. endfor
-.endif
-
-.include <bsd.port.post.mk>
diff --git a/sysutils/tracker-client/distinfo b/sysutils/tracker-client/distinfo
deleted file mode 100644
index 2848e25a3..000000000
--- a/sysutils/tracker-client/distinfo
+++ /dev/null
@@ -1,3 +0,0 @@
-MD5 (tracker-0.6.95.tar.bz2) = a4edc8aa830070bd3f1d80a7df07c80c
-SHA256 (tracker-0.6.95.tar.bz2) = 0fe42353117c62ccc9de3b3c9c11acf707a0702d30cd24b8d1cd1e2581dec339
-SIZE (tracker-0.6.95.tar.bz2) = 1399996
diff --git a/sysutils/tracker-client/files/patch-src_libtracker-common_tracker-albumart.c b/sysutils/tracker-client/files/patch-src_libtracker-common_tracker-albumart.c
deleted file mode 100644
index d2467b17c..000000000
--- a/sysutils/tracker-client/files/patch-src_libtracker-common_tracker-albumart.c
+++ /dev/null
@@ -1,12 +0,0 @@
---- src/libtracker-common/tracker-albumart.c.orig 2009-08-08 17:37:48.000000000 +0000
-+++ src/libtracker-common/tracker-albumart.c 2009-08-08 17:38:14.000000000 +0000
-@@ -81,7 +81,8 @@
- return retval;
- }
-
--#ifndef HAVE_STRCASESTR
-+#if 0
-+// #ifndef HAVE_STRCASESTR
-
- static gchar *
- strcasestr (const gchar *haystack,
diff --git a/sysutils/tracker-client/files/patch-src_libtracker-common_tracker-type-utils.c b/sysutils/tracker-client/files/patch-src_libtracker-common_tracker-type-utils.c
deleted file mode 100644
index c6f07b336..000000000
--- a/sysutils/tracker-client/files/patch-src_libtracker-common_tracker-type-utils.c
+++ /dev/null
@@ -1,13 +0,0 @@
---- src/libtracker-common/tracker-type-utils.c.orig 2009-08-08 17:29:36.000000000 +0000
-+++ src/libtracker-common/tracker-type-utils.c 2009-08-08 17:30:09.000000000 +0000
-@@ -531,8 +531,8 @@
- /* mktime() always assumes that "tm" is in locale time but we
- * want to keep control on time, so we go to UTC
- */
-- t = mktime (&tm);
-- t -= timezone;
-+
-+ t = timegm (&tm);
-
- if (*date_string == '+' ||
- *date_string == '-') {
diff --git a/sysutils/tracker-client/files/patch-src_libtracker-gtk_Makefile.in b/sysutils/tracker-client/files/patch-src_libtracker-gtk_Makefile.in
deleted file mode 100644
index a5d3b6c17..000000000
--- a/sysutils/tracker-client/files/patch-src_libtracker-gtk_Makefile.in
+++ /dev/null
@@ -1,19 +0,0 @@
---- src/libtracker-gtk/Makefile.in.orig 2009-08-08 17:07:00.000000000 +0000
-+++ src/libtracker-gtk/Makefile.in 2009-08-08 17:09:07.000000000 +0000
-@@ -66,7 +66,6 @@
- LTLIBRARIES = $(lib_LTLIBRARIES)
- am__DEPENDENCIES_1 =
- libtracker_gtk_la_DEPENDENCIES = \
-- $(top_builddir)/src/libtracker/libtrackerclient.la \
- $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1)
- am_libtracker_gtk_la_OBJECTS = tracker-utils.lo tracker-ui.lo \
- tracker-metadata-tile.lo tracker-tag-bar.lo \
-@@ -355,7 +354,7 @@
- tracker-keyword-store.c
-
- libtracker_gtk_la_LIBADD = \
-- $(top_builddir)/src/libtracker/libtrackerclient.la \
-+ -ltrackerclient \
- $(LIBTRACKERGTK_LIBS) \
- $(GCOV_LIBS)
-
diff --git a/sysutils/tracker-client/files/patch-src_libtracker-gtk_tracker-tag-bar.h b/sysutils/tracker-client/files/patch-src_libtracker-gtk_tracker-tag-bar.h
deleted file mode 100644
index 950306602..000000000
--- a/sysutils/tracker-client/files/patch-src_libtracker-gtk_tracker-tag-bar.h
+++ /dev/null
@@ -1,11 +0,0 @@
---- src/libtracker-gtk/tracker-tag-bar.h.orig 2007-07-17 04:35:33.000000000 +0400
-+++ src/libtracker-gtk/tracker-tag-bar.h 2007-08-25 00:53:14.000000000 +0400
-@@ -59,6 +59,8 @@
- const gchar *uri
- );
-
-+GType tracker_tag_bar_get_type(void);
-+
- G_END_DECLS
-
- #endif /* TRACKER_TAG_BAR_H */
diff --git a/sysutils/tracker-client/files/patch-src_tracker-applet_Makefile.in b/sysutils/tracker-client/files/patch-src_tracker-applet_Makefile.in
deleted file mode 100644
index e00d83cf4..000000000
--- a/sysutils/tracker-client/files/patch-src_tracker-applet_Makefile.in
+++ /dev/null
@@ -1,22 +0,0 @@
---- src/tracker-applet/Makefile.in.orig 2009-08-08 17:11:05.000000000 +0000
-+++ src/tracker-applet/Makefile.in 2009-08-08 17:12:21.000000000 +0000
-@@ -65,8 +65,6 @@
- tracker_applet_OBJECTS = $(am_tracker_applet_OBJECTS)
- am__DEPENDENCIES_1 =
- tracker_applet_DEPENDENCIES = \
-- $(top_builddir)/src/libtracker/libtrackerclient.la \
-- $(top_builddir)/src/libtracker-common/libtracker-common.la \
- $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \
- $(am__DEPENDENCIES_1)
- DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir)
-@@ -345,8 +343,8 @@
- $(GCOV_CFLAGS)
-
- tracker_applet_LDADD = \
-- $(top_builddir)/src/libtracker/libtrackerclient.la \
-- $(top_builddir)/src/libtracker-common/libtracker-common.la \
-+ -ltrackerclient \
-+ -ltracker-common \
- $(TRACKER_APPLET_LIBS) \
- $(LIBGLADE_LIBS) \
- $(GCOV_LIBS)
diff --git a/sysutils/tracker-client/files/patch-src_tracker-preferences_Makefile.in b/sysutils/tracker-client/files/patch-src_tracker-preferences_Makefile.in
deleted file mode 100644
index 76095e88b..000000000
--- a/sysutils/tracker-client/files/patch-src_tracker-preferences_Makefile.in
+++ /dev/null
@@ -1,22 +0,0 @@
---- src/tracker-preferences/Makefile.in.orig 2009-08-08 17:13:03.000000000 +0000
-+++ src/tracker-preferences/Makefile.in 2009-08-08 17:14:08.000000000 +0000
-@@ -67,8 +67,6 @@
- tracker_preferences_OBJECTS = $(am_tracker_preferences_OBJECTS)
- am__DEPENDENCIES_1 =
- tracker_preferences_DEPENDENCIES = \
-- $(top_builddir)/src/libtracker/libtrackerclient.la \
-- $(top_builddir)/src/libtracker-common/libtracker-common.la \
- $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \
- $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1)
- DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir)
-@@ -361,8 +359,8 @@
- tracker-preferences-utils.h
-
- tracker_preferences_LDADD = \
-- $(top_builddir)/src/libtracker/libtrackerclient.la \
-- $(top_builddir)/src/libtracker-common/libtracker-common.la \
-+ -ltrackerclient \
-+ -ltracker-common \
- $(LIBGLADE_LIBS) \
- $(GTK2_LIBS) \
- $(DBUS_LIBS) \
diff --git a/sysutils/tracker-client/files/patch-src_tracker-search-tool_Makefile.in b/sysutils/tracker-client/files/patch-src_tracker-search-tool_Makefile.in
deleted file mode 100644
index 0130754f0..000000000
--- a/sysutils/tracker-client/files/patch-src_tracker-search-tool_Makefile.in
+++ /dev/null
@@ -1,24 +0,0 @@
---- src/tracker-search-tool/Makefile.in.orig 2009-08-08 17:14:44.000000000 +0000
-+++ src/tracker-search-tool/Makefile.in 2009-08-08 17:15:51.000000000 +0000
-@@ -69,9 +69,7 @@
- tracker_search_tool_DEPENDENCIES = $(am__DEPENDENCIES_1) \
- $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \
- $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \
-- $(am__DEPENDENCIES_1) \
-- $(top_builddir)/src/libtracker-gtk/libtracker-gtk.la \
-- $(top_builddir)/src/libtracker/libtrackerclient.la
-+ $(am__DEPENDENCIES_1)
- DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir)
- depcomp = $(SHELL) $(top_srcdir)/depcomp
- am__depfiles_maybe = depfiles
-@@ -367,8 +365,8 @@
- $(GCOV_LIBS) \
- $(GNOMEDESKTOP_LIBS) \
- $(DBUS_LIBS) \
-- $(top_builddir)/src/libtracker-gtk/libtracker-gtk.la \
-- $(top_builddir)/src/libtracker/libtrackerclient.la
-+ -ltracker-gtk \
-+ -ltrackerclient
-
- desktopdir = $(datadir)/applications
- desktop_DATA = tracker-search-tool.desktop
diff --git a/sysutils/tracker-client/files/patch-src_tracker-search-tool_tracker-search-tool-support.h b/sysutils/tracker-client/files/patch-src_tracker-search-tool_tracker-search-tool-support.h
deleted file mode 100644
index 609f18068..000000000
--- a/sysutils/tracker-client/files/patch-src_tracker-search-tool_tracker-search-tool-support.h
+++ /dev/null
@@ -1,18 +0,0 @@
---- src/tracker-search-tool/tracker-search-tool-support.h.orig 2007-07-21 20:55:20.000000000 +0400
-+++ src/tracker-search-tool/tracker-search-tool-support.h 2007-08-24 22:31:05.000000000 +0400
-@@ -143,6 +143,15 @@
- tracker_search_get_stored_window_geometry (gint * width,
- gint * height);
-
-+void
-+tracker_set_stored_separator_position (int pos);
-+
-+char *
-+tracker_string_replace (const char *haystack, char *needle, char *replacement);
-+
-+int
-+tracker_get_stored_separator_position ();
-+
- #ifdef __cplusplus
- }
- #endif
diff --git a/sysutils/tracker-client/pkg-descr b/sysutils/tracker-client/pkg-descr
deleted file mode 100644
index fbabf7af0..000000000
--- a/sysutils/tracker-client/pkg-descr
+++ /dev/null
@@ -1,13 +0,0 @@
-Tracker is a powerful desktop-neutral first class object database, tag/metadata
-database, search tool and indexer.
-
-Tracker is also extremely fast and super efficient with your systems memory when
-compared with some other competing frameworks and is by far the fastest and most
-memory efficient Nautilus search and Deskbar backends currently availble.
-
-It consists of a common object database that allows entities to have an almost
-infinte number of properties, metadata (both embedded/harvested as well as user
-definable), a comprehensive database of keywords/tags and links to other
-entities.
-
-WWW: http://www.tracker-project.org/
diff --git a/sysutils/tracker-client/pkg-plist b/sysutils/tracker-client/pkg-plist
deleted file mode 100644
index e55381d7c..000000000
--- a/sysutils/tracker-client/pkg-plist
+++ /dev/null
@@ -1,310 +0,0 @@
-bin/tracker-files
-bin/tracker-info
-bin/tracker-meta-folder
-bin/tracker-processes
-bin/tracker-query
-bin/tracker-search
-bin/tracker-services
-bin/tracker-stats
-bin/tracker-status
-bin/tracker-tag
-bin/tracker-unique
-etc/xdg/autostart/trackerd.desktop
-include/tracker-1.0/libtracker-common/tracker-common.h
-include/tracker-1.0/libtracker-common/tracker-config.h
-include/tracker-1.0/libtracker-common/tracker-field.h
-include/tracker-1.0/libtracker-common/tracker-file-utils.h
-include/tracker-1.0/libtracker-common/tracker-language.h
-include/tracker-1.0/libtracker-common/tracker-module-config.h
-include/tracker-1.0/libtracker-common/tracker-ontology.h
-include/tracker-1.0/libtracker-common/tracker-parser.h
-include/tracker-1.0/libtracker-common/tracker-service.h
-include/tracker-1.0/libtracker-common/tracker-type-utils.h
-include/tracker-1.0/libtracker-common/tracker-utils.h
-include/tracker-1.0/libtracker-module/tracker-module-file.h
-include/tracker-1.0/libtracker-module/tracker-module-iteratable.h
-include/tracker-1.0/libtracker-module/tracker-module-metadata-utils.h
-include/tracker-1.0/libtracker-module/tracker-module-metadata.h
-include/tracker-1.0/libtracker-module/tracker-module.h
-include/tracker-daemon-glue.h
-include/tracker-files-glue.h
-include/tracker-keywords-glue.h
-include/tracker-metadata-glue.h
-include/tracker-search-glue.h
-include/tracker.h
-lib/libtrackerclient.a
-lib/libtrackerclient.la
-lib/libtrackerclient.so
-lib/libtrackerclient.so.0
-lib/tracker/extract-modules/libextract-abw.a
-lib/tracker/extract-modules/libextract-abw.la
-lib/tracker/extract-modules/libextract-abw.so
-lib/tracker/extract-modules/libextract-gstreamer.a
-lib/tracker/extract-modules/libextract-gstreamer.la
-lib/tracker/extract-modules/libextract-gstreamer.so
-lib/tracker/extract-modules/libextract-html.a
-lib/tracker/extract-modules/libextract-html.la
-lib/tracker/extract-modules/libextract-html.so
-lib/tracker/extract-modules/libextract-jpeg.a
-lib/tracker/extract-modules/libextract-jpeg.la
-lib/tracker/extract-modules/libextract-jpeg.so
-lib/tracker/extract-modules/libextract-mp3.a
-lib/tracker/extract-modules/libextract-mp3.la
-lib/tracker/extract-modules/libextract-mp3.so
-lib/tracker/extract-modules/libextract-oasis.a
-lib/tracker/extract-modules/libextract-oasis.la
-lib/tracker/extract-modules/libextract-oasis.so
-lib/tracker/extract-modules/libextract-pdf.a
-lib/tracker/extract-modules/libextract-pdf.la
-lib/tracker/extract-modules/libextract-pdf.so
-lib/tracker/extract-modules/libextract-playlist.a
-lib/tracker/extract-modules/libextract-playlist.la
-lib/tracker/extract-modules/libextract-playlist.so
-lib/tracker/extract-modules/libextract-png.a
-lib/tracker/extract-modules/libextract-png.la
-lib/tracker/extract-modules/libextract-png.so
-lib/tracker/extract-modules/libextract-ps.a
-lib/tracker/extract-modules/libextract-ps.la
-lib/tracker/extract-modules/libextract-ps.so
-lib/tracker/extract-modules/libextract-tiff.a
-lib/tracker/extract-modules/libextract-tiff.la
-lib/tracker/extract-modules/libextract-tiff.so
-lib/tracker/extract-modules/libextract-vorbis.a
-lib/tracker/extract-modules/libextract-vorbis.la
-lib/tracker/extract-modules/libextract-vorbis.so
-lib/tracker/extract-modules/libextract-xmp.a
-lib/tracker/extract-modules/libextract-xmp.la
-lib/tracker/extract-modules/libextract-xmp.so
-lib/tracker/filters/application/csv_filter
-lib/tracker/filters/application/msword_filter
-lib/tracker/filters/application/pdf_filter
-lib/tracker/filters/application/tab-separated-values_filter
-lib/tracker/filters/application/vnd.ms-excel_filter
-lib/tracker/filters/application/vnd.oasis.opendocument.presentation-template_filter
-lib/tracker/filters/application/vnd.oasis.opendocument.presentation_filter
-lib/tracker/filters/application/vnd.oasis.opendocument.spreadsheet-template_filter
-lib/tracker/filters/application/vnd.oasis.opendocument.spreadsheet_filter
-lib/tracker/filters/application/vnd.oasis.opendocument.text-template_filter
-lib/tracker/filters/application/vnd.oasis.opendocument.text_filter
-lib/tracker/filters/application/vnd.stardivision.writer_filter
-lib/tracker/filters/application/vnd.sun.xml.calc.template_filter
-lib/tracker/filters/application/vnd.sun.xml.calc_filter
-lib/tracker/filters/application/vnd.sun.xml.draw_filter
-lib/tracker/filters/application/vnd.sun.xml.impress.template_filter
-lib/tracker/filters/application/vnd.sun.xml.impress_filter
-lib/tracker/filters/application/vnd.sun.xml.writer.template_filter
-lib/tracker/filters/application/vnd.sun.xml.writer_filter
-lib/tracker/filters/application/x-abiword_filter
-lib/tracker/filters/application/x-gnumeric_filter
-lib/tracker/filters/text/csv_filter
-lib/tracker/filters/text/djvu_filter
-lib/tracker/filters/text/html_filter
-lib/tracker/filters/text/spreadsheet_filter
-lib/tracker/filters/text/tab-separated-values_filter
-lib/tracker/filters/text/x-comma-separated-values_filter
-lib/tracker/filters/text/x-tex_filter
-lib/tracker/filters/text/xml_filter
-lib/tracker/indexer-modules/libtracker-module-applications.a
-lib/tracker/indexer-modules/libtracker-module-applications.la
-lib/tracker/indexer-modules/libtracker-module-applications.so
-lib/tracker/indexer-modules/libtracker-module-evolution.a
-lib/tracker/indexer-modules/libtracker-module-evolution.la
-lib/tracker/indexer-modules/libtracker-module-evolution.so
-lib/tracker/indexer-modules/libtracker-module-files.a
-lib/tracker/indexer-modules/libtracker-module-files.la
-lib/tracker/indexer-modules/libtracker-module-files.so
-lib/tracker/indexer-modules/libtracker-module-gaim-conversations.a
-lib/tracker/indexer-modules/libtracker-module-gaim-conversations.la
-lib/tracker/indexer-modules/libtracker-module-gaim-conversations.so
-lib/tracker/libstemmer.a
-lib/tracker/libstemmer.la
-lib/tracker/libstemmer.so
-lib/tracker/libstemmer.so.0
-lib/tracker/libtracker-common.a
-lib/tracker/libtracker-common.la
-lib/tracker/libtracker-common.so
-lib/tracker/libtracker-common.so.0
-lib/tracker/libtracker-data.a
-lib/tracker/libtracker-data.la
-lib/tracker/libtracker-data.so
-lib/tracker/libtracker-data.so.0
-lib/tracker/libtracker-db.a
-lib/tracker/libtracker-db.la
-lib/tracker/libtracker-db.so
-lib/tracker/libtracker-db.so.0
-lib/tracker/libtracker-module.a
-lib/tracker/libtracker-module.la
-lib/tracker/libtracker-module.so
-lib/tracker/libtracker-module.so.0
-libdata/pkgconfig/tracker-module-1.0.pc
-libdata/pkgconfig/tracker.pc
-libexec/tracker-extract
-libexec/tracker-indexer
-libexec/trackerd
-share/dbus-1/services/org.freedesktop.Tracker.Extract.service
-share/dbus-1/services/org.freedesktop.Tracker.Indexer.service
-share/dbus-1/services/org.freedesktop.Tracker.service
-share/doc/libtracker-common/ch01.html
-share/doc/libtracker-common/ch02.html
-share/doc/libtracker-common/ch03.html
-share/doc/libtracker-common/ch04.html
-share/doc/libtracker-common/ch05.html
-share/doc/libtracker-common/home.png
-share/doc/libtracker-common/index.html
-share/doc/libtracker-common/index.sgml
-share/doc/libtracker-common/left.png
-share/doc/libtracker-common/libtracker-common-Config.html
-share/doc/libtracker-common/libtracker-common-DBus.html
-share/doc/libtracker-common/libtracker-common-Fields.html
-share/doc/libtracker-common/libtracker-common-File-Operations.html
-share/doc/libtracker-common/libtracker-common-General.html
-share/doc/libtracker-common/libtracker-common-HAL.html
-share/doc/libtracker-common/libtracker-common-IO-Priority.html
-share/doc/libtracker-common/libtracker-common-Language.html
-share/doc/libtracker-common/libtracker-common-Logging.html
-share/doc/libtracker-common/libtracker-common-Module-Config.html
-share/doc/libtracker-common/libtracker-common-NFS-Locking.html
-share/doc/libtracker-common/libtracker-common-Ontology.html
-share/doc/libtracker-common/libtracker-common-Parser.html
-share/doc/libtracker-common/libtracker-common-Service.html
-share/doc/libtracker-common/libtracker-common-Type-Conversions.html
-share/doc/libtracker-common/libtracker-common.devhelp
-share/doc/libtracker-common/libtracker-common.devhelp2
-share/doc/libtracker-common/libtracker-common.html
-share/doc/libtracker-common/right.png
-share/doc/libtracker-common/style.css
-share/doc/libtracker-common/up.png
-share/doc/libtracker-module/adding-categories.html
-share/doc/libtracker-module/ch01.html
-share/doc/libtracker-module/ch02.html
-share/doc/libtracker-module/creating-extractor-module-binary.html
-share/doc/libtracker-module/defining-properties.html
-share/doc/libtracker-module/home.png
-share/doc/libtracker-module/how-to-add-an-extractor.html
-share/doc/libtracker-module/index.html
-share/doc/libtracker-module/index.sgml
-share/doc/libtracker-module/installing-an-extractor.html
-share/doc/libtracker-module/integrating-applications.html
-share/doc/libtracker-module/left.png
-share/doc/libtracker-module/libtracker-module-Iteratable-files.html
-share/doc/libtracker-module/libtracker-module-Metadata-Convenience-Fallback-Functions.html
-share/doc/libtracker-module/libtracker-module-Metadata-Object.html
-share/doc/libtracker-module/libtracker-module-Module-files.html
-share/doc/libtracker-module/libtracker-module.devhelp
-share/doc/libtracker-module/libtracker-module.devhelp2
-share/doc/libtracker-module/right.png
-share/doc/libtracker-module/style.css
-share/doc/libtracker-module/testing-an-extractor.html
-share/doc/libtracker-module/tracker-indexer.html
-share/doc/libtracker-module/up.png
-share/doc/libtracker-module/writing-an-extractor.html
-share/doc/libtracker-module/writing-an-indexer-module.html
-share/icons/hicolor/16x16/apps/tracker.png
-share/icons/hicolor/22x22/apps/tracker.png
-share/icons/hicolor/24x24/apps/tracker.png
-share/icons/hicolor/32x32/apps/tracker.png
-share/icons/hicolor/48x48/apps/tracker.png
-share/icons/hicolor/scalable/apps/tracker.svg
-share/locale/ar/LC_MESSAGES/tracker.mo
-share/locale/be/LC_MESSAGES/tracker.mo
-share/locale/be@latin/LC_MESSAGES/tracker.mo
-share/locale/ca/LC_MESSAGES/tracker.mo
-share/locale/cs/LC_MESSAGES/tracker.mo
-share/locale/da/LC_MESSAGES/tracker.mo
-share/locale/de/LC_MESSAGES/tracker.mo
-share/locale/dz/LC_MESSAGES/tracker.mo
-share/locale/el/LC_MESSAGES/tracker.mo
-share/locale/en_GB/LC_MESSAGES/tracker.mo
-share/locale/es/LC_MESSAGES/tracker.mo
-share/locale/et/LC_MESSAGES/tracker.mo
-share/locale/fi/LC_MESSAGES/tracker.mo
-share/locale/fr/LC_MESSAGES/tracker.mo
-share/locale/gl/LC_MESSAGES/tracker.mo
-share/locale/he/LC_MESSAGES/tracker.mo
-share/locale/hu/LC_MESSAGES/tracker.mo
-share/locale/it/LC_MESSAGES/tracker.mo
-share/locale/ja/LC_MESSAGES/tracker.mo
-share/locale/ko/LC_MESSAGES/tracker.mo
-share/locale/lt/LC_MESSAGES/tracker.mo
-share/locale/mk/LC_MESSAGES/tracker.mo
-share/locale/nb/LC_MESSAGES/tracker.mo
-share/locale/nl/LC_MESSAGES/tracker.mo
-share/locale/oc/LC_MESSAGES/tracker.mo
-share/locale/pl/LC_MESSAGES/tracker.mo
-share/locale/pt/LC_MESSAGES/tracker.mo
-share/locale/pt_BR/LC_MESSAGES/tracker.mo
-share/locale/ru/LC_MESSAGES/tracker.mo
-share/locale/sk/LC_MESSAGES/tracker.mo
-share/locale/sl/LC_MESSAGES/tracker.mo
-share/locale/sv/LC_MESSAGES/tracker.mo
-share/locale/th/LC_MESSAGES/tracker.mo
-share/locale/zh_CN/LC_MESSAGES/tracker.mo
-%%DATADIR%%/languages/stopwords.da
-%%DATADIR%%/languages/stopwords.de
-%%DATADIR%%/languages/stopwords.en
-%%DATADIR%%/languages/stopwords.es
-%%DATADIR%%/languages/stopwords.fi
-%%DATADIR%%/languages/stopwords.fr
-%%DATADIR%%/languages/stopwords.hu
-%%DATADIR%%/languages/stopwords.it
-%%DATADIR%%/languages/stopwords.nb
-%%DATADIR%%/languages/stopwords.nl
-%%DATADIR%%/languages/stopwords.pt
-%%DATADIR%%/languages/stopwords.ru
-%%DATADIR%%/languages/stopwords.sv
-%%DATADIR%%/modules/applications.module
-%%DATADIR%%/modules/evolution.module
-%%DATADIR%%/modules/files.module
-%%DATADIR%%/modules/gaim-conversations.module
-%%DATADIR%%/services/application.metadata
-%%DATADIR%%/services/audio.metadata
-%%DATADIR%%/services/conversation.metadata
-%%DATADIR%%/services/default.metadata
-%%DATADIR%%/services/default.service
-%%DATADIR%%/services/document.metadata
-%%DATADIR%%/services/email.metadata
-%%DATADIR%%/services/file.metadata
-%%DATADIR%%/services/image.metadata
-%%DATADIR%%/services/playlist.metadata
-%%DATADIR%%/services/video.metadata
-%%DATADIR%%/sqlite-cache.sql
-%%DATADIR%%/sqlite-contents.sql
-%%DATADIR%%/sqlite-email.sql
-%%DATADIR%%/sqlite-fulltext.sql
-%%DATADIR%%/sqlite-metadata.sql
-%%DATADIR%%/sqlite-service-triggers.sql
-%%DATADIR%%/sqlite-service-types.sql
-%%DATADIR%%/sqlite-service.sql
-%%DATADIR%%/sqlite-stored-procs.sql
-%%DATADIR%%/sqlite-tracker-triggers.sql
-%%DATADIR%%/sqlite-tracker.sql
-%%DATADIR%%/sqlite-user-data.sql
-%%DATADIR%%/tracker-backup.xml
-%%DATADIR%%/tracker-daemon.xml
-%%DATADIR%%/tracker-extract.xml
-%%DATADIR%%/tracker-files.xml
-%%DATADIR%%/tracker-indexer.xml
-%%DATADIR%%/tracker-keywords.xml
-%%DATADIR%%/tracker-metadata.xml
-%%DATADIR%%/tracker-search.xml
-@dirrm %%DATADIR%%/services
-@dirrm %%DATADIR%%/modules
-@dirrm %%DATADIR%%/languages
-@dirrm %%DATADIR%%
-@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
-@dirrm share/doc/libtracker-module
-@dirrm share/doc/libtracker-common
-@dirrm lib/tracker/indexer-modules
-@dirrm lib/tracker/filters/text
-@dirrm lib/tracker/filters/application
-@dirrm lib/tracker/filters
-@dirrm lib/tracker/extract-modules
-@dirrm lib/tracker
-@dirrm include/tracker-1.0/libtracker-module
-@dirrm include/tracker-1.0/libtracker-common
-@dirrm include/tracker-1.0
diff --git a/sysutils/tracker-gnome/Makefile b/sysutils/tracker-gnome/Makefile
deleted file mode 100644
index 819f2cc4e..000000000
--- a/sysutils/tracker-gnome/Makefile
+++ /dev/null
@@ -1,16 +0,0 @@
-# New ports collection makefile for: tracker-gnome
-# Date created: 2008-03-30
-# Whom: Michael Johnson <ahze@FreeBSD.org>
-#
-# $FreeBSD$
-# $MCom: ports/sysutils/tracker-gnome/Makefile,v 1.2 2009/04/09 03:24:09 mezz Exp $
-
-PORTREVISION= 0
-
-COMMENT= Tracker GNOME applet, search tool, and preference programs
-
-TRACKER_SLAVE= gnome
-PLIST= ${.CURDIR}/pkg-plist
-MASTERDIR= ${.CURDIR}/../../sysutils/tracker-client
-
-.include "${MASTERDIR}/Makefile"
diff --git a/sysutils/tracker-gnome/pkg-plist b/sysutils/tracker-gnome/pkg-plist
deleted file mode 100644
index 2587a84e1..000000000
--- a/sysutils/tracker-gnome/pkg-plist
+++ /dev/null
@@ -1,15 +0,0 @@
-bin/tracker-applet
-bin/tracker-preferences
-bin/tracker-search-tool
-etc/xdg/autostart/tracker-applet.desktop
-share/applications/tracker-preferences.desktop
-share/applications/tracker-search-tool.desktop
-%%DATADIR%%/icons/thumbnail_frame.png
-%%DATADIR%%/icons/tracker-applet-default.png
-%%DATADIR%%/icons/tracker-applet-indexing1.png
-%%DATADIR%%/icons/tracker-applet-indexing2.png
-%%DATADIR%%/icons/tracker-applet-paused.png
-%%DATADIR%%/tracker-applet-prefs.glade
-%%DATADIR%%/tracker-preferences.glade
-@dirrm %%DATADIR%%/icons
-@dirrmtry share/applications
diff --git a/sysutils/tracker-libtrackergtk/Makefile b/sysutils/tracker-libtrackergtk/Makefile
deleted file mode 100644
index 96a2295b5..000000000
--- a/sysutils/tracker-libtrackergtk/Makefile
+++ /dev/null
@@ -1,17 +0,0 @@
-# New ports collection makefile for: tracker-libtrackergtk
-# Date created: 2008-03-30
-# Whom: Michael Johnson <ahze@FreeBSD.org>
-#
-# $FreeBSD$
-# $MCom: ports-stable/sysutils/tracker-libtrackergtk/Makefile,v 1.1 2008/03/30 20:39:09 ahze Exp $
-
-PORTREVISION= 0
-
-COMMENT= Gtk bindings to tracker and GSF data extract module (MS docs)
-
-TRACKER_SLAVE= libtrackergtk
-PLIST= ${.CURDIR}/pkg-plist
-DESCR= ${.CURDIR}/pkg-descr
-MASTERDIR= ${.CURDIR}/../../sysutils/tracker-client
-
-.include "${MASTERDIR}/Makefile"
diff --git a/sysutils/tracker-libtrackergtk/pkg-descr b/sysutils/tracker-libtrackergtk/pkg-descr
deleted file mode 100644
index 9e7a18286..000000000
--- a/sysutils/tracker-libtrackergtk/pkg-descr
+++ /dev/null
@@ -1,3 +0,0 @@
-Gtk bindings to tracker and GSF data extract module (Microsoft Office docs)
-
-WWW: http://www.tracker-project.org/
diff --git a/sysutils/tracker-libtrackergtk/pkg-plist b/sysutils/tracker-libtrackergtk/pkg-plist
deleted file mode 100644
index a4408617c..000000000
--- a/sysutils/tracker-libtrackergtk/pkg-plist
+++ /dev/null
@@ -1,14 +0,0 @@
-include/libtracker-gtk/tracker-gtk.h
-include/libtracker-gtk/tracker-keyword-store.h
-include/libtracker-gtk/tracker-metadata-tile.h
-include/libtracker-gtk/tracker-tag-bar.h
-include/libtracker-gtk/tracker-ui.h
-include/libtracker-gtk/tracker-utils.h
-lib/libtracker-gtk.a
-lib/libtracker-gtk.la
-lib/libtracker-gtk.so
-lib/libtracker-gtk.so.0
-lib/tracker/extract-modules/libextract-msoffice.a
-lib/tracker/extract-modules/libextract-msoffice.la
-lib/tracker/extract-modules/libextract-msoffice.so
-@dirrm include/libtracker-gtk
diff --git a/sysutils/tracker/Makefile b/sysutils/tracker/Makefile
deleted file mode 100644
index ace85924f..000000000
--- a/sysutils/tracker/Makefile
+++ /dev/null
@@ -1,37 +0,0 @@
-# New ports collection makefile for: tracker
-# Date created: 2006-12-09
-# Whom: Michael Johnson <ahze@FreeBSD.org>
-#
-# $FreeBSD$
-# $MCom: ports-stable/sysutils/tracker/Makefile,v 1.2 2008/03/31 00:28:58 ahze Exp $
-#
-
-PORTNAME= tracker
-PORTVERSION= 0.6.95
-CATEGORIES= sysutils gnome
-MASTER_SITES= # empty
-DISTFILES= # empty
-EXTRACT_ONLY= # empty
-
-MAINTAINER= gnome@FreeBSD.org
-COMMENT= Tracker search tool and indexer metaport
-
-RUN_DEPENDS= trackerd:${PORTSDIR}/sysutils/tracker-client
-
-NO_BUILD= yes
-OPTIONS= GNOME "Gnome preferences, panel applet, and search tool" Off \
- MSOFFICE "Enable search for Microsoft Office Docs (uses gtk)" Off
-
-.include <bsd.port.pre.mk>
-
-.if defined(WITH_GNOME)
-RUN_DEPENDS+= tracker-applet:${PORTSDIR}/sysutils/tracker-gnome
-.endif
-
-.if defined(WITH_MSOFFICE)
-RUN_DEPENDS+= ${LOCALBASE}/lib/tracker/extract-modules/libextract-msoffice.so:${PORTSDIR}/sysutils/tracker-libtrackergtk
-.endif
-
-do-install:
-
-.include <bsd.port.post.mk>
diff --git a/sysutils/tracker/pkg-descr b/sysutils/tracker/pkg-descr
deleted file mode 100644
index fbabf7af0..000000000
--- a/sysutils/tracker/pkg-descr
+++ /dev/null
@@ -1,13 +0,0 @@
-Tracker is a powerful desktop-neutral first class object database, tag/metadata
-database, search tool and indexer.
-
-Tracker is also extremely fast and super efficient with your systems memory when
-compared with some other competing frameworks and is by far the fastest and most
-memory efficient Nautilus search and Deskbar backends currently availble.
-
-It consists of a common object database that allows entities to have an almost
-infinte number of properties, metadata (both embedded/harvested as well as user
-definable), a comprehensive database of keywords/tags and links to other
-entities.
-
-WWW: http://www.tracker-project.org/