diff options
| author | Koop Mast <kwm@FreeBSD.org> | 2010-05-10 21:19:08 +0000 |
|---|---|---|
| committer | Koop Mast <kwm@FreeBSD.org> | 2010-05-10 21:19:08 +0000 |
| commit | 48e62d9a379cd45a15f6ae89d564f81b3c13d16e (patch) | |
| tree | b627baa77f19bb1eab2fa4dee08aab1908131cd0 /sysutils | |
| parent | fbdf96410f8e803568c33397323dd9d8d3af995f (diff) | |
| download | ports-48e62d9a379cd45a15f6ae89d564f81b3c13d16e.tar.gz ports-48e62d9a379cd45a15f6ae89d564f81b3c13d16e.zip | |
Notes
Diffstat (limited to 'sysutils')
99 files changed, 1966 insertions, 4488 deletions
diff --git a/sysutils/Makefile b/sysutils/Makefile index 6ef359a545ae..2b75a98d15ab 100644 --- a/sysutils/Makefile +++ b/sysutils/Makefile @@ -843,6 +843,7 @@ SUBDIR += uniutils SUBDIR += unquote SUBDIR += unstow + SUBDIR += upower SUBDIR += upsd SUBDIR += upsdaemon SUBDIR += upsmon diff --git a/sysutils/brasero/Makefile b/sysutils/brasero/Makefile index af04b7b498ea..a21ba7d18330 100644 --- a/sysutils/brasero/Makefile +++ b/sysutils/brasero/Makefile @@ -3,11 +3,10 @@ # Whom: Michael Johnson <ahze@FreeBSD.org> # # $FreeBSD$ -# $MCom: ports/sysutils/brasero/Makefile,v 1.59 2009/10/24 01:52:39 avl Exp $ +# $MCom: ports/sysutils/brasero/Makefile,v 1.71 2010/04/27 20:38:56 kwm Exp $ PORTNAME= brasero -PORTVERSION= 2.28.3 -PORTREVISION= 2 +PORTVERSION= 2.30.1 CATEGORIES= sysutils audio multimedia gnome MASTER_SITES= GNOME DIST_SUBDIR= gnome2 @@ -17,7 +16,8 @@ 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 + totem-plparser.17:${PORTSDIR}/multimedia/totem-pl-parser \ + canberra-gtk.0:${PORTSDIR}/audio/libcanberra RUN_DEPENDS= growisofs:${PORTSDIR}/sysutils/dvd+rw-tools \ cdrdao:${PORTSDIR}/sysutils/cdrdao @@ -61,4 +61,8 @@ PLIST_SUB+= LIBBURNIA="" PLIST_SUB+= LIBBURNIA="@comment " .endif +post-patch: + @${REINPLACE_CMD} -e 's|%%LOCALBASE%%|${LOCALBASE}|g' \ + ${WRKSRC}/libbrasero-burn/burn-process.c + .include <bsd.port.post.mk> diff --git a/sysutils/brasero/distinfo b/sysutils/brasero/distinfo index 92525e36567b..39893f67a966 100644 --- a/sysutils/brasero/distinfo +++ b/sysutils/brasero/distinfo @@ -1,3 +1,3 @@ -MD5 (gnome2/brasero-2.28.3.tar.bz2) = 6ef5cc07325f1869577a85d15ac67eb3 -SHA256 (gnome2/brasero-2.28.3.tar.bz2) = adaee8f93170d5799cddcd116a01a8687fabb86575dd5dc88f1f668bb397623c -SIZE (gnome2/brasero-2.28.3.tar.bz2) = 4025939 +MD5 (gnome2/brasero-2.30.1.tar.bz2) = 01c313f02939ee7dd277cafe11a5ef89 +SHA256 (gnome2/brasero-2.30.1.tar.bz2) = 676922e42192f38c82b40b460f896fa4653dd55a336365ace1fa64d9fc441f0e +SIZE (gnome2/brasero-2.30.1.tar.bz2) = 4310409 diff --git a/sysutils/brasero/files/patch-libbrasero-burn_burn-process.c b/sysutils/brasero/files/patch-libbrasero-burn_burn-process.c new file mode 100644 index 000000000000..b2b34227195f --- /dev/null +++ b/sysutils/brasero/files/patch-libbrasero-burn_burn-process.c @@ -0,0 +1,10 @@ +--- libbrasero-burn/burn-process.c.orig 2010-03-07 15:07:48.000000000 -0500 ++++ libbrasero-burn/burn-process.c 2010-03-07 15:08:41.000000000 -0500 +@@ -609,6 +609,7 @@ brasero_process_start (BraseroJob *job, + gchar *envp [] = { "LANG=C", + "LANGUAGE=C", + "LC_ALL=C", ++ "PATH=/bin:/sbin:/usr/bin:/usr/sbin:%%LOCALBASE%%/bin:%%LOCALBASE%%/sbin", + NULL}; + + if (priv->pid) 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 e342112f8562..000000000000 --- 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-plist b/sysutils/brasero/pkg-plist index 5d2b0ef37991..c9ba877869f6 100644 --- a/sysutils/brasero/pkg-plist +++ b/sysutils/brasero/pkg-plist @@ -30,8 +30,12 @@ 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-audio2cue.la +lib/brasero/plugins/libbrasero-audio2cue.so lib/brasero/plugins/libbrasero-burn-uri.la lib/brasero/plugins/libbrasero-burn-uri.so +lib/brasero/plugins/libbrasero-cdda2wav.la +lib/brasero/plugins/libbrasero-cdda2wav.so lib/brasero/plugins/libbrasero-cdrdao.la lib/brasero/plugins/libbrasero-cdrdao.so lib/brasero/plugins/libbrasero-cdrecord.la @@ -64,8 +68,6 @@ 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 @@ -74,6 +76,8 @@ 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/girepository-1.0/BraseroBurn-1.0.typelib +lib/girepository-1.0/BraseroMedia-1.0.typelib lib/libbrasero-burn.la lib/libbrasero-burn.so lib/libbrasero-burn.so.2 @@ -107,8 +111,6 @@ 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 @@ -119,6 +121,8 @@ 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-data-cfg.html +share/doc/libbrasero-burn/libbrasero-burn-brasero-track-data.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 @@ -133,12 +137,12 @@ 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-drive.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 @@ -302,9 +306,13 @@ share/doc/libbrasero-media/up.png %%DATADIR%%/icons/hicolor/scalable/status/brasero-disc-90.svg %%DATADIR%%/icons/hicolor/scalable/status/brasero-disc-95.svg %%DATADIR%%/logo.png +share/gir-1.0/BraseroBurn-1.0.gir +share/gir-1.0/BraseroMedia-1.0.gir 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/bg/brasero.xml +share/gnome/help/brasero/bg/figures/brasero_main.png share/gnome/help/brasero/ca/brasero.xml share/gnome/help/brasero/ca/figures/brasero_main.png share/gnome/help/brasero/cs/brasero.xml @@ -339,6 +347,7 @@ 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/af/LC_MESSAGES/brasero.mo share/locale/ar/LC_MESSAGES/brasero.mo share/locale/as/LC_MESSAGES/brasero.mo share/locale/ast/LC_MESSAGES/brasero.mo @@ -355,6 +364,7 @@ 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/en@shaw/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 @@ -366,6 +376,7 @@ 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/id/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 @@ -403,6 +414,7 @@ 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-bg.omf share/omf/brasero/brasero-ca.omf share/omf/brasero/brasero-cs.omf share/omf/brasero/brasero-de.omf @@ -446,6 +458,8 @@ share/omf/brasero/brasero-zh_TW.omf @dirrm share/gnome/help/brasero/cs @dirrm share/gnome/help/brasero/ca/figures @dirrm share/gnome/help/brasero/ca +@dirrm share/gnome/help/brasero/bg/figures +@dirrm share/gnome/help/brasero/bg @dirrm share/gnome/help/brasero/C/figures @dirrm share/gnome/help/brasero/C @dirrm share/gnome/help/brasero @@ -481,8 +495,6 @@ share/omf/brasero/brasero-zh_TW.omf @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 @@ -497,6 +509,8 @@ share/omf/brasero/brasero-zh_TW.omf @dirrmtry share/locale/mai @dirrmtry share/locale/ku/LC_MESSAGES @dirrmtry share/locale/ku +@dirrmtry share/locale/en@shaw/LC_MESSAGES +@dirrmtry share/locale/en@shaw @dirrmtry share/locale/dz/LC_MESSAGES @dirrmtry share/locale/dz @dirrmtry share/locale/ca@valencia/LC_MESSAGES @@ -505,3 +519,5 @@ share/omf/brasero/brasero-zh_TW.omf @dirrmtry share/locale/bn_IN @dirrmtry share/locale/ast/LC_MESSAGES @dirrmtry share/locale/ast +@dirrmtry share/locale/as/LC_MESSAGES +@dirrmtry share/locale/as diff --git a/sysutils/bubblemon2/Makefile b/sysutils/bubblemon2/Makefile index 34f600e1efb4..2f71000b97b1 100644 --- a/sysutils/bubblemon2/Makefile +++ b/sysutils/bubblemon2/Makefile @@ -7,7 +7,7 @@ PORTNAME= bubblemon2 PORTVERSION= 2.0.9 -PORTREVISION= 5 +PORTREVISION= 6 CATEGORIES= sysutils gnome MASTER_SITES= SAVANNAH/bubblemon DISTNAME= bubblemon-${PORTVERSION} @@ -17,7 +17,7 @@ COMMENT= A system CPU and memory load monitor for GNOME2 LIB_DEPENDS= gtop-2.0:${PORTSDIR}/devel/libgtop -USE_GNOME= gnomehack gnomepanel gnomeprefix gnometarget intlhack +USE_GNOME= gnomehack gnomepanel gnomeprefix gnometarget intlhack libgnomeui USE_GMAKE= yes GNU_CONFIGURE= yes CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include `pkg-config --cflags libgnomeui-2.0`" \ diff --git a/sysutils/gconf-editor/Makefile b/sysutils/gconf-editor/Makefile index 857ff762f0e2..4330d1eb61f9 100644 --- a/sysutils/gconf-editor/Makefile +++ b/sysutils/gconf-editor/Makefile @@ -3,12 +3,11 @@ # Whom: Joe Marcus Clarke <marcus@FreeBSD.org> # # $FreeBSD$ -# $MCom: ports/sysutils/gconf-editor/Makefile,v 1.79 2009/09/21 18:42:34 kwm Exp $ +# $MCom: ports/sysutils/gconf-editor/Makefile,v 1.82 2010/04/01 15:48:36 kwm Exp $ # PORTNAME= gconf-editor -PORTVERSION= 2.28.0 -PORTREVISION= 2 +PORTVERSION= 2.30.0 PORTEPOCH= 1 CATEGORIES= sysutils gnome MASTER_SITES= GNOME diff --git a/sysutils/gconf-editor/distinfo b/sysutils/gconf-editor/distinfo index ee5f4ddc8035..5e4a61561202 100644 --- a/sysutils/gconf-editor/distinfo +++ b/sysutils/gconf-editor/distinfo @@ -1,3 +1,3 @@ -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 +MD5 (gnome2/gconf-editor-2.30.0.tar.bz2) = 2a941e3c64843be69190f38891470580 +SHA256 (gnome2/gconf-editor-2.30.0.tar.bz2) = 955d8eb6ff39f72002a7cfb0bed5e4b6eaad45410441e4a5a767767ec6db26d4 +SIZE (gnome2/gconf-editor-2.30.0.tar.bz2) = 1389176 diff --git a/sysutils/gconf-editor/pkg-plist b/sysutils/gconf-editor/pkg-plist index 3ec7408b43ad..056eace55b96 100644 --- a/sysutils/gconf-editor/pkg-plist +++ b/sysutils/gconf-editor/pkg-plist @@ -158,6 +158,7 @@ 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@shaw/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 @@ -304,6 +305,8 @@ share/omf/gconf-editor/gconf-editor-zh_CN.omf @dirrmtry share/locale/mai @dirrmtry share/locale/ku/LC_MESSAGES @dirrmtry share/locale/ku +@dirrmtry share/locale/en@shaw/LC_MESSAGES +@dirrmtry share/locale/en@shaw @dirrmtry share/locale/dz/LC_MESSAGES @dirrmtry share/locale/dz @dirrmtry share/locale/ca@valencia/LC_MESSAGES diff --git a/sysutils/gnome-control-center/Makefile b/sysutils/gnome-control-center/Makefile index 67fb43d7da32..33762484d79b 100644 --- a/sysutils/gnome-control-center/Makefile +++ b/sysutils/gnome-control-center/Makefile @@ -3,12 +3,11 @@ # Whom: Joe Marcus Clarke <marcus@FreeBSD.org> # # $FreeBSD$ -# $MCom: ports/sysutils/gnome-control-center/Makefile,v 1.198 2009/10/20 00:09:19 kwm Exp $ +# $MCom: ports/sysutils/gnome-control-center/Makefile,v 1.207 2010/04/28 08:26:27 kwm Exp $ # PORTNAME= gnome-control-center -PORTVERSION= 2.28.1 -PORTREVISION= 3 +PORTVERSION= 2.30.1 CATEGORIES= sysutils gnome MASTER_SITES= GNOME DIST_SUBDIR= gnome2 diff --git a/sysutils/gnome-control-center/distinfo b/sysutils/gnome-control-center/distinfo index bbba4e0ca540..7a5ae7dcc490 100644 --- a/sysutils/gnome-control-center/distinfo +++ b/sysutils/gnome-control-center/distinfo @@ -1,3 +1,3 @@ -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 +MD5 (gnome2/gnome-control-center-2.30.1.tar.bz2) = 9608eae5605cfc478ba35b683bf129c1 +SHA256 (gnome2/gnome-control-center-2.30.1.tar.bz2) = db050803a4bf3a2297255b8fff4810f2125a5b001d3fd785ee1ecd7f2c6f593b +SIZE (gnome2/gnome-control-center-2.30.1.tar.bz2) = 2830194 diff --git a/sysutils/gnome-control-center/files/patch-configure b/sysutils/gnome-control-center/files/patch-configure index 6527e6758b0e..31566627790d 100644 --- a/sysutils/gnome-control-center/files/patch-configure +++ b/sysutils/gnome-control-center/files/patch-configure @@ -1,10 +1,10 @@ --- 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 +@@ -12525,6 +12525,7 @@ + if test "${gt_cv_func_ngettext_libc+set}" = set; then : + $as_echo_n "(cached) " >&6 else + LIBS="-lintl $LIBS" - cat >conftest.$ac_ext <<_ACEOF - /* confdefs.h. */ - _ACEOF + cat confdefs.h - <<_ACEOF >conftest.$ac_ext + /* end confdefs.h. */ + diff --git a/sysutils/gnome-control-center/pkg-plist b/sysutils/gnome-control-center/pkg-plist index 8624fe5f53b0..54023d50b185 100644 --- a/sysutils/gnome-control-center/pkg-plist +++ b/sysutils/gnome-control-center/pkg-plist @@ -58,22 +58,34 @@ share/desktop-directories/gnomecc.directory %%ABOUTME%%%%DATADIR%%/pixmaps/gnome-about-me-lock.png %%DATADIR%%/pixmaps/gtk-theme-thumbnailing.png %%DATADIR%%/pixmaps/icon-theme-thumbnailing.png +%%ABOUTME%%%%DATADIR%%/pixmaps/left-index-finger.png %%ABOUTME%%%%DATADIR%%/pixmaps/left-index-finger.svg +%%ABOUTME%%%%DATADIR%%/pixmaps/left-little-finger.png %%ABOUTME%%%%DATADIR%%/pixmaps/left-little-finger.svg +%%ABOUTME%%%%DATADIR%%/pixmaps/left-middle-finger.png %%ABOUTME%%%%DATADIR%%/pixmaps/left-middle-finger.svg +%%ABOUTME%%%%DATADIR%%/pixmaps/left-ring-finger.png %%ABOUTME%%%%DATADIR%%/pixmaps/left-ring-finger.svg +%%ABOUTME%%%%DATADIR%%/pixmaps/left-thumb.png %%ABOUTME%%%%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 +%%ABOUTME%%%%DATADIR%%/pixmaps/print_error.png %%ABOUTME%%%%DATADIR%%/pixmaps/print_error.svg +%%ABOUTME%%%%DATADIR%%/pixmaps/print_ok.png %%ABOUTME%%%%DATADIR%%/pixmaps/print_ok.svg +%%ABOUTME%%%%DATADIR%%/pixmaps/right-index-finger.png %%ABOUTME%%%%DATADIR%%/pixmaps/right-index-finger.svg +%%ABOUTME%%%%DATADIR%%/pixmaps/right-little-finger.png %%ABOUTME%%%%DATADIR%%/pixmaps/right-little-finger.svg +%%ABOUTME%%%%DATADIR%%/pixmaps/right-middle-finger.png %%ABOUTME%%%%DATADIR%%/pixmaps/right-middle-finger.svg +%%ABOUTME%%%%DATADIR%%/pixmaps/right-ring-finger.png %%ABOUTME%%%%DATADIR%%/pixmaps/right-ring-finger.svg +%%ABOUTME%%%%DATADIR%%/pixmaps/right-thumb.png %%ABOUTME%%%%DATADIR%%/pixmaps/right-thumb.svg %%DATADIR%%/pixmaps/subpixel-bgr.png %%DATADIR%%/pixmaps/subpixel-rgb.png @@ -84,17 +96,17 @@ share/desktop-directories/gnomecc.directory %%DATADIR%%/ui/appearance.ui %%DATADIR%%/ui/at-enable-dialog.ui %%DATADIR%%/ui/display-capplet.ui -%%ABOUTME%%share/gnome-control-center/ui/gnome-about-me-dialog.ui -%%ABOUTME%%share/gnome-control-center/ui/gnome-about-me-fingerprint.ui -%%ABOUTME%%share/gnome-control-center/ui/gnome-about-me-password.ui +%%ABOUTME%%%%DATADIR%%/ui/gnome-about-me-dialog.ui +%%ABOUTME%%%%DATADIR%%/ui/gnome-about-me-fingerprint.ui +%%ABOUTME%%%%DATADIR%%/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-keyboard-properties-a11y-notifications.ui +%%DATADIR%%/ui/gnome-keyboard-properties-dialog.ui +%%DATADIR%%/ui/gnome-keyboard-properties-layout-chooser.ui +%%DATADIR%%/ui/gnome-keyboard-properties-model-chooser.ui +%%DATADIR%%/ui/gnome-keyboard-properties-options-dialog.ui +%%DATADIR%%/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 @@ -131,6 +143,7 @@ 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/th/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 @@ -176,6 +189,7 @@ 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/en@shaw/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 @@ -207,6 +221,7 @@ 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/nds/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 @@ -261,6 +276,7 @@ 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-th.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 @@ -268,6 +284,7 @@ share/omf/control-center/control-center-zh_CN.omf @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/th @dirrm share/gnome/help/control-center/sv @dirrm share/gnome/help/control-center/ru @dirrm share/gnome/help/control-center/pt_BR @@ -319,6 +336,8 @@ share/omf/control-center/control-center-zh_CN.omf @dirrmtry share/locale/oc @dirrmtry share/locale/nso/LC_MESSAGES @dirrmtry share/locale/nso +@dirrmtry share/locale/nds/LC_MESSAGES +@dirrmtry share/locale/nds @dirrmtry share/locale/mr/LC_MESSAGES @dirrmtry share/locale/mr @dirrmtry share/locale/mg/LC_MESSAGES @@ -327,6 +346,8 @@ share/omf/control-center/control-center-zh_CN.omf @dirrmtry share/locale/mai @dirrmtry share/locale/ku/LC_MESSAGES @dirrmtry share/locale/ku +@dirrmtry share/locale/en@shaw/LC_MESSAGES +@dirrmtry share/locale/en@shaw @dirrmtry share/locale/dz/LC_MESSAGES @dirrmtry share/locale/dz @dirrmtry share/locale/crh/LC_MESSAGES diff --git a/sysutils/gnome-power-manager/Makefile b/sysutils/gnome-power-manager/Makefile index 76c35fcb8271..ce333ca769b3 100644 --- a/sysutils/gnome-power-manager/Makefile +++ b/sysutils/gnome-power-manager/Makefile @@ -3,12 +3,11 @@ # Whom: Joe Marcus Clarke <marcus@FreeBSD.org> # # $FreeBSD$ -# $MCom: ports/sysutils/gnome-power-manager/Makefile,v 1.54 2009/10/25 00:02:31 marcus Exp $ +# $MCom: ports/sysutils/gnome-power-manager/Makefile,v 1.63 2010/04/26 17:38:05 kwm Exp $ # PORTNAME= gnome-power-manager -PORTVERSION= 2.24.4 -PORTREVISION= 10 +PORTVERSION= 2.30.1 CATEGORIES= sysutils gnome MASTER_SITES= GNOME DIST_SUBDIR= gnome2 @@ -16,12 +15,11 @@ 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/dtd/catalog:${PORTSDIR}/textproc/docbook-410 LIB_DEPENDS= hal.1:${PORTSDIR}/sysutils/hal \ + devkit-power-gobject.1:${PORTSDIR}/sysutils/upower \ + canberra-gtk.0:${PORTSDIR}/audio/libcanberra \ 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 @@ -30,22 +28,29 @@ 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 + --enable-hal CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \ LDFLAGS="-L${LOCALBASE}/lib" GCONF_SCHEMAS= gnome-power-manager.schemas +.if !defined(NO_INSTALL_MANPAGES) +BUILD_DEPENDS+= docbook2html:${PORTSDIR}/textproc/docbook-utils \ + ${LOCALBASE}/share/sgml/docbook/4.1/dtd/catalog:${PORTSDIR}/textproc/docbook-410 MAN1= gnome-power-manager.1 gnome-power-preferences.1 \ gnome-power-statistics.1 +.endif post-patch: @${REINPLACE_CMD} -e 's|-lresolv|| ; s|-Werror||g' \ ${WRKSRC}/configure +.if defined(NO_INSTALL_MANPAGES) + @${REINPLACE_CMD} -e "s|2MAN_TRUE=$$|2MAN_TRUE='#'|g ; \ + s|2MAN_FALSE='#'|2MAN_FALSE=|g" ${WRKSRC}/configure +.endif .include <bsd.port.mk> diff --git a/sysutils/gnome-power-manager/distinfo b/sysutils/gnome-power-manager/distinfo index c3465ec86ed7..644f6020406d 100644 --- a/sysutils/gnome-power-manager/distinfo +++ b/sysutils/gnome-power-manager/distinfo @@ -1,3 +1,3 @@ -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 +MD5 (gnome2/gnome-power-manager-2.30.1.tar.bz2) = b85178b8db77db5d22e185430549a295 +SHA256 (gnome2/gnome-power-manager-2.30.1.tar.bz2) = 47af6221ae83d329088abd8f5176f503fe5f81417a7c6766c95279b0af05021c +SIZE (gnome2/gnome-power-manager-2.30.1.tar.bz2) = 3854167 diff --git a/sysutils/gnome-power-manager/files/patch-applets_brightness_Makefile.in b/sysutils/gnome-power-manager/files/patch-applets_brightness_Makefile.in new file mode 100644 index 000000000000..9a5d2c5a5417 --- /dev/null +++ b/sysutils/gnome-power-manager/files/patch-applets_brightness_Makefile.in @@ -0,0 +1,10 @@ +--- applets/brightness/Makefile.in.orig 2010-01-01 20:51:42.000000000 +0800 ++++ applets/brightness/Makefile.in 2010-01-01 20:51:42.000000000 +0800 +@@ -344,6 +344,7 @@ + gnome_brightness_applet_LDADD = \ + $(DBUS_LIBS) \ + $(GNOME_LIBS) \ ++ -lexecinfo \ + $(PANEL_LIBS) + + serverdir = $(prefix)/libdata/bonobo/servers diff --git a/sysutils/gnome-power-manager/files/patch-applets_inhibit_Makefile.in b/sysutils/gnome-power-manager/files/patch-applets_inhibit_Makefile.in new file mode 100644 index 000000000000..4965221fe0e9 --- /dev/null +++ b/sysutils/gnome-power-manager/files/patch-applets_inhibit_Makefile.in @@ -0,0 +1,10 @@ +--- applets/inhibit/Makefile.in.orig 2010-01-01 20:53:23.000000000 +0800 ++++ applets/inhibit/Makefile.in 2010-01-01 20:53:36.000000000 +0800 +@@ -343,6 +343,7 @@ + gnome_inhibit_applet_LDADD = \ + $(DBUS_LIBS) \ + $(GNOME_LIBS) \ ++ -lexecinfo \ + $(PANEL_LIBS) + + serverdir = $(prefix)/libdata/bonobo/servers diff --git a/sysutils/gnome-power-manager/files/patch-configure b/sysutils/gnome-power-manager/files/patch-configure new file mode 100644 index 000000000000..69d50145e201 --- /dev/null +++ b/sysutils/gnome-power-manager/files/patch-configure @@ -0,0 +1,25 @@ +--- configure.orig 2010-01-30 18:17:55.000000000 -0500 ++++ configure 2010-01-30 18:18:23.000000000 -0500 +@@ -12822,21 +12822,15 @@ if test "$GCC" = "yes"; then + WARNINGFLAGS="$WARNINGFLAGS -Wreturn-type" + WARNINGFLAGS="$WARNINGFLAGS -Wformat-nonliteral" + WARNINGFLAGS="$WARNINGFLAGS -Wformat-security" +- WARNINGFLAGS="$WARNINGFLAGS -Wmissing-include-dirs" + WARNINGFLAGS="$WARNINGFLAGS -Wmissing-format-attribute" +- WARNINGFLAGS="$WARNINGFLAGS -Wclobbered" +- WARNINGFLAGS="$WARNINGFLAGS -Wempty-body" +- WARNINGFLAGS="$WARNINGFLAGS -Wignored-qualifiers" + # WARNINGFLAGS="$WARNINGFLAGS -Wsign-compare" +- WARNINGFLAGS="$WARNINGFLAGS -Wtype-limits" + # WARNINGFLAGS="$WARNINGFLAGS -Wuninitialized" + # WARNINGFLAGS="$WARNINGFLAGS -Waggregate-return" + WARNINGFLAGS="$WARNINGFLAGS -Wdeclaration-after-statement" + WARNINGFLAGS="$WARNINGFLAGS -Wshadow" + WARNINGFLAGS="$WARNINGFLAGS -Winline" + # WARNINGFLAGS="$WARNINGFLAGS -Wswitch-enum" +- WARNINGFLAGS="$WARNINGFLAGS -Wmissing-parameter-type" +- WARNINGFLAGS="$WARNINGFLAGS -Woverride-init" ++# WARNINGFLAGS="$WARNINGFLAGS -Woverride-init" + WARNINGFLAGS="$WARNINGFLAGS -Wno-strict-aliasing" + else + WARNINGFLAGS="" 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 6d98cece2825..000000000000 --- 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 index 8bbbfb172700..a161ee0fabad 100644 --- a/sysutils/gnome-power-manager/files/patch-src_Makefile.in +++ b/sysutils/gnome-power-manager/files/patch-src_Makefile.in @@ -1,29 +1,37 @@ ---- 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 = \ +--- src/Makefile.in.orig 2010-03-30 18:08:05.000000000 +0800 ++++ src/Makefile.in 2010-03-30 18:09:04.000000000 +0800 +@@ -497,6 +497,7 @@ + $(GNOME_LIBS) \ + $(UNIQUE_LIBS) \ + $(DBUS_LIBS) \ ++ -lexecinfo \ + -lm + + gnome_power_statistics_CFLAGS = \ +@@ -511,7 +512,7 @@ + + gnome_power_preferences_LDADD = libgpmshared.a $(GLIB_LIBS) \ + $(X11_LIBS) $(GNOME_LIBS) $(DBUS_LIBS) $(UNIQUE_LIBS) \ +- $(GPM_EXTRA_LIBS) $(DEVKIT_LIBS) -lm $(am__append_1) ++ $(GPM_EXTRA_LIBS) $(DEVKIT_LIBS) -lexecinfo -lm $(am__append_1) + gnome_power_preferences_CFLAGS = \ + $(WARNINGFLAGS) \ + $(NULL) +@@ -531,7 +532,7 @@ + gnome_power_manager_LDADD = libgpmshared.a $(GLIB_LIBS) $(X11_LIBS) \ + $(GSTREAMER_LIBS) $(GNOME_LIBS) $(DBUS_LIBS) $(X11_LIBS) \ + $(CANBERRA_LIBS) $(LIBNOTIFY_LIBS) $(GPM_EXTRA_LIBS) \ +- $(DEVKIT_LIBS) -lm $(am__append_3) ++ $(DEVKIT_LIBS) -lexecinfo -lm $(am__append_3) + gnome_power_manager_CFLAGS = \ + $(WARNINGFLAGS) \ $(NULL) +@@ -590,7 +591,7 @@ - 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 \ + gnome_power_self_test_LDADD = $(GLIB_LIBS) $(X11_LIBS) $(GNOME_LIBS) \ + $(GSTREAMER_LIBS) $(DEVKIT_LIBS) $(DBUS_LIBS) $(X11_LIBS) \ +- $(LIBNOTIFY_LIBS) $(GPM_EXTRA_LIBS) -lm $(am__append_4) ++ $(LIBNOTIFY_LIBS) $(GPM_EXTRA_LIBS) -lexecinfo -lm $(am__append_4) + gnome_power_self_test_CFLAGS = -DEGG_TEST $(AM_CFLAGS) $(WARNINGFLAGS) + BUILT_SOURCES = \ + org.gnome.PowerManager.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 8273665a522c..000000000000 --- 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 7960d9f22d74..000000000000 --- 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 ea8e92f03661..000000000000 --- 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/files/patch-src_gpm-dpms.c b/sysutils/gnome-power-manager/files/patch-src_gpm-dpms.c deleted file mode 100644 index 2b62e06643dd..000000000000 --- a/sysutils/gnome-power-manager/files/patch-src_gpm-dpms.c +++ /dev/null @@ -1,11 +0,0 @@ ---- src/gpm-dpms.c.orig 2008-09-04 05:05:15.000000000 -0500 -+++ src/gpm-dpms.c 2010-05-07 08:36:53.000000000 -0500 -@@ -39,7 +39,7 @@ - #ifdef HAVE_DPMS_EXTENSION - #include <X11/Xproto.h> - #include <X11/extensions/dpms.h> --#include <X11/extensions/dpmsstr.h> -+#include <X11/extensions/dpmsproto.h> - #endif - - #include "gpm-conf.h" diff --git a/sysutils/gnome-power-manager/files/patch-src_gpm-load.c b/sysutils/gnome-power-manager/files/patch-src_gpm-load.c index b9e08c982b72..eaa8df1b22aa 100644 --- a/sysutils/gnome-power-manager/files/patch-src_gpm-load.c +++ b/sysutils/gnome-power-manager/files/patch-src_gpm-load.c @@ -1,5 +1,5 @@ ---- src/gpm-load.c.orig 2010-01-02 21:57:09.000000000 -0500 -+++ src/gpm-load.c 2010-01-02 21:59:16.000000000 -0500 +--- src/gpm-load.c.orig 2010-01-01 23:29:11.000000000 -0500 ++++ src/gpm-load.c 2010-01-01 23:46:31.000000000 -0500 @@ -33,6 +33,10 @@ #include <kstat.h> #include <sys/sysinfo.h> @@ -11,7 +11,7 @@ #ifdef HAVE_UNISTD_H #include <unistd.h> #endif /* HAVE_UNISTD_H */ -@@ -159,6 +163,32 @@ out: +@@ -151,6 +155,32 @@ out: return FALSE; } @@ -44,3 +44,12 @@ #else /** +@@ -192,7 +222,7 @@ gpm_load_get_cpu_values (long unsigned * + *cpu_total = cpu_user + cpu_nice + cpu_system + *cpu_idle; + ret = TRUE; + out: +- if (!fd) ++ if (fd) + fclose (fd); + return ret; + } diff --git a/sysutils/gnome-power-manager/pkg-descr b/sysutils/gnome-power-manager/pkg-descr index 5b789d06c24b..186c9ced498f 100644 --- a/sysutils/gnome-power-manager/pkg-descr +++ b/sysutils/gnome-power-manager/pkg-descr @@ -1,7 +1,7 @@ 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 +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/ +WWW: http://projects.gnome.org/gnome-power-manager/ diff --git a/sysutils/gnome-power-manager/pkg-plist b/sysutils/gnome-power-manager/pkg-plist index 9329befef483..47e2c200a9c6 100644 --- a/sysutils/gnome-power-manager/pkg-plist +++ b/sysutils/gnome-power-manager/pkg-plist @@ -1,8 +1,8 @@ bin/gnome-power-bugreport.sh -bin/gnome-power-cmd.sh bin/gnome-power-manager bin/gnome-power-preferences bin/gnome-power-statistics +etc/xdg/autostart/gnome-power-manager.desktop libdata/bonobo/servers/GNOME_BrightnessApplet.server libdata/bonobo/servers/GNOME_InhibitApplet.server libexec/gnome-brightness-applet @@ -12,16 +12,28 @@ 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%%/acme.ui +%%DATADIR%%/gpm-feedback-widget.ui +%%DATADIR%%/gpm-prefs.ui +%%DATADIR%%/gpm-statistics.ui %%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-battery-000-charging.png +%%DATADIR%%/icons/hicolor/16x16/status/gpm-battery-000.png +%%DATADIR%%/icons/hicolor/16x16/status/gpm-battery-020-charging.png +%%DATADIR%%/icons/hicolor/16x16/status/gpm-battery-020.png +%%DATADIR%%/icons/hicolor/16x16/status/gpm-battery-040-charging.png +%%DATADIR%%/icons/hicolor/16x16/status/gpm-battery-040.png +%%DATADIR%%/icons/hicolor/16x16/status/gpm-battery-060-charging.png +%%DATADIR%%/icons/hicolor/16x16/status/gpm-battery-060.png +%%DATADIR%%/icons/hicolor/16x16/status/gpm-battery-080-charging.png +%%DATADIR%%/icons/hicolor/16x16/status/gpm-battery-080.png +%%DATADIR%%/icons/hicolor/16x16/status/gpm-battery-100-charging.png +%%DATADIR%%/icons/hicolor/16x16/status/gpm-battery-100.png +%%DATADIR%%/icons/hicolor/16x16/status/gpm-battery-charged.png +%%DATADIR%%/icons/hicolor/16x16/status/gpm-battery-empty.png +%%DATADIR%%/icons/hicolor/16x16/status/gpm-battery-missing.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 @@ -31,31 +43,23 @@ share/gnome-2.0/ui/GNOME_InhibitApplet.xml %%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-020.png +%%DATADIR%%/icons/hicolor/16x16/status/gpm-keyboard-040.png %%DATADIR%%/icons/hicolor/16x16/status/gpm-keyboard-060.png +%%DATADIR%%/icons/hicolor/16x16/status/gpm-keyboard-080.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-020.png +%%DATADIR%%/icons/hicolor/16x16/status/gpm-mouse-040.png %%DATADIR%%/icons/hicolor/16x16/status/gpm-mouse-060.png +%%DATADIR%%/icons/hicolor/16x16/status/gpm-mouse-080.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-020.png +%%DATADIR%%/icons/hicolor/16x16/status/gpm-phone-040.png %%DATADIR%%/icons/hicolor/16x16/status/gpm-phone-060.png +%%DATADIR%%/icons/hicolor/16x16/status/gpm-phone-080.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 @@ -68,11 +72,25 @@ share/gnome-2.0/ui/GNOME_InhibitApplet.xml %%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-battery-000-charging.png +%%DATADIR%%/icons/hicolor/22x22/status/gpm-battery-000.png +%%DATADIR%%/icons/hicolor/22x22/status/gpm-battery-020-charging.png +%%DATADIR%%/icons/hicolor/22x22/status/gpm-battery-020.png +%%DATADIR%%/icons/hicolor/22x22/status/gpm-battery-040-charging.png +%%DATADIR%%/icons/hicolor/22x22/status/gpm-battery-040.png +%%DATADIR%%/icons/hicolor/22x22/status/gpm-battery-060-charging.png +%%DATADIR%%/icons/hicolor/22x22/status/gpm-battery-060.png +%%DATADIR%%/icons/hicolor/22x22/status/gpm-battery-080-charging.png +%%DATADIR%%/icons/hicolor/22x22/status/gpm-battery-080.png +%%DATADIR%%/icons/hicolor/22x22/status/gpm-battery-100-charging.png +%%DATADIR%%/icons/hicolor/22x22/status/gpm-battery-100.png +%%DATADIR%%/icons/hicolor/22x22/status/gpm-battery-charged.png +%%DATADIR%%/icons/hicolor/22x22/status/gpm-battery-empty.png +%%DATADIR%%/icons/hicolor/22x22/status/gpm-battery-missing.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 @@ -82,31 +100,23 @@ share/gnome-2.0/ui/GNOME_InhibitApplet.xml %%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-020.png +%%DATADIR%%/icons/hicolor/22x22/status/gpm-keyboard-040.png %%DATADIR%%/icons/hicolor/22x22/status/gpm-keyboard-060.png +%%DATADIR%%/icons/hicolor/22x22/status/gpm-keyboard-080.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-020.png +%%DATADIR%%/icons/hicolor/22x22/status/gpm-mouse-040.png %%DATADIR%%/icons/hicolor/22x22/status/gpm-mouse-060.png +%%DATADIR%%/icons/hicolor/22x22/status/gpm-mouse-080.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-020.png +%%DATADIR%%/icons/hicolor/22x22/status/gpm-phone-040.png %%DATADIR%%/icons/hicolor/22x22/status/gpm-phone-060.png +%%DATADIR%%/icons/hicolor/22x22/status/gpm-phone-080.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 @@ -119,11 +129,25 @@ share/gnome-2.0/ui/GNOME_InhibitApplet.xml %%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-battery-000-charging.png +%%DATADIR%%/icons/hicolor/24x24/status/gpm-battery-000.png +%%DATADIR%%/icons/hicolor/24x24/status/gpm-battery-020-charging.png +%%DATADIR%%/icons/hicolor/24x24/status/gpm-battery-020.png +%%DATADIR%%/icons/hicolor/24x24/status/gpm-battery-040-charging.png +%%DATADIR%%/icons/hicolor/24x24/status/gpm-battery-040.png +%%DATADIR%%/icons/hicolor/24x24/status/gpm-battery-060-charging.png +%%DATADIR%%/icons/hicolor/24x24/status/gpm-battery-060.png +%%DATADIR%%/icons/hicolor/24x24/status/gpm-battery-080-charging.png +%%DATADIR%%/icons/hicolor/24x24/status/gpm-battery-080.png +%%DATADIR%%/icons/hicolor/24x24/status/gpm-battery-100-charging.png +%%DATADIR%%/icons/hicolor/24x24/status/gpm-battery-100.png +%%DATADIR%%/icons/hicolor/24x24/status/gpm-battery-charged.png +%%DATADIR%%/icons/hicolor/24x24/status/gpm-battery-empty.png +%%DATADIR%%/icons/hicolor/24x24/status/gpm-battery-missing.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 @@ -133,31 +157,23 @@ share/gnome-2.0/ui/GNOME_InhibitApplet.xml %%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-020.png +%%DATADIR%%/icons/hicolor/24x24/status/gpm-keyboard-040.png %%DATADIR%%/icons/hicolor/24x24/status/gpm-keyboard-060.png +%%DATADIR%%/icons/hicolor/24x24/status/gpm-keyboard-080.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-020.png +%%DATADIR%%/icons/hicolor/24x24/status/gpm-mouse-040.png %%DATADIR%%/icons/hicolor/24x24/status/gpm-mouse-060.png +%%DATADIR%%/icons/hicolor/24x24/status/gpm-mouse-080.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-020.png +%%DATADIR%%/icons/hicolor/24x24/status/gpm-phone-040.png %%DATADIR%%/icons/hicolor/24x24/status/gpm-phone-060.png +%%DATADIR%%/icons/hicolor/24x24/status/gpm-phone-080.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 @@ -170,11 +186,82 @@ share/gnome-2.0/ui/GNOME_InhibitApplet.xml %%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/32x32/actions/gpm-hibernate.png +%%DATADIR%%/icons/hicolor/32x32/actions/gpm-suspend.png +%%DATADIR%%/icons/hicolor/32x32/status/gpm-ac-adapter.png +%%DATADIR%%/icons/hicolor/32x32/status/gpm-battery-000-charging.png +%%DATADIR%%/icons/hicolor/32x32/status/gpm-battery-000.png +%%DATADIR%%/icons/hicolor/32x32/status/gpm-battery-020-charging.png +%%DATADIR%%/icons/hicolor/32x32/status/gpm-battery-020.png +%%DATADIR%%/icons/hicolor/32x32/status/gpm-battery-040-charging.png +%%DATADIR%%/icons/hicolor/32x32/status/gpm-battery-040.png +%%DATADIR%%/icons/hicolor/32x32/status/gpm-battery-060-charging.png +%%DATADIR%%/icons/hicolor/32x32/status/gpm-battery-060.png +%%DATADIR%%/icons/hicolor/32x32/status/gpm-battery-080-charging.png +%%DATADIR%%/icons/hicolor/32x32/status/gpm-battery-080.png +%%DATADIR%%/icons/hicolor/32x32/status/gpm-battery-100-charging.png +%%DATADIR%%/icons/hicolor/32x32/status/gpm-battery-100.png +%%DATADIR%%/icons/hicolor/32x32/status/gpm-battery-charged.png +%%DATADIR%%/icons/hicolor/32x32/status/gpm-battery-empty.png +%%DATADIR%%/icons/hicolor/32x32/status/gpm-battery-missing.png +%%DATADIR%%/icons/hicolor/32x32/status/gpm-brightness-kbd-disabled.png +%%DATADIR%%/icons/hicolor/32x32/status/gpm-brightness-kbd-invalid.png +%%DATADIR%%/icons/hicolor/32x32/status/gpm-brightness-kbd.png +%%DATADIR%%/icons/hicolor/32x32/status/gpm-brightness-lcd-disabled.png +%%DATADIR%%/icons/hicolor/32x32/status/gpm-brightness-lcd-invalid.png +%%DATADIR%%/icons/hicolor/32x32/status/gpm-brightness-lcd.png +%%DATADIR%%/icons/hicolor/32x32/status/gpm-inhibit-invalid.png +%%DATADIR%%/icons/hicolor/32x32/status/gpm-inhibit.png +%%DATADIR%%/icons/hicolor/32x32/status/gpm-keyboard-000.png +%%DATADIR%%/icons/hicolor/32x32/status/gpm-keyboard-020.png +%%DATADIR%%/icons/hicolor/32x32/status/gpm-keyboard-040.png +%%DATADIR%%/icons/hicolor/32x32/status/gpm-keyboard-060.png +%%DATADIR%%/icons/hicolor/32x32/status/gpm-keyboard-080.png +%%DATADIR%%/icons/hicolor/32x32/status/gpm-keyboard-100.png +%%DATADIR%%/icons/hicolor/32x32/status/gpm-mouse-000.png +%%DATADIR%%/icons/hicolor/32x32/status/gpm-mouse-020.png +%%DATADIR%%/icons/hicolor/32x32/status/gpm-mouse-040.png +%%DATADIR%%/icons/hicolor/32x32/status/gpm-mouse-060.png +%%DATADIR%%/icons/hicolor/32x32/status/gpm-mouse-080.png +%%DATADIR%%/icons/hicolor/32x32/status/gpm-mouse-100.png +%%DATADIR%%/icons/hicolor/32x32/status/gpm-phone-000.png +%%DATADIR%%/icons/hicolor/32x32/status/gpm-phone-020.png +%%DATADIR%%/icons/hicolor/32x32/status/gpm-phone-040.png +%%DATADIR%%/icons/hicolor/32x32/status/gpm-phone-060.png +%%DATADIR%%/icons/hicolor/32x32/status/gpm-phone-080.png +%%DATADIR%%/icons/hicolor/32x32/status/gpm-phone-100.png +%%DATADIR%%/icons/hicolor/32x32/status/gpm-ups-000-charging.png +%%DATADIR%%/icons/hicolor/32x32/status/gpm-ups-000.png +%%DATADIR%%/icons/hicolor/32x32/status/gpm-ups-020-charging.png +%%DATADIR%%/icons/hicolor/32x32/status/gpm-ups-020.png +%%DATADIR%%/icons/hicolor/32x32/status/gpm-ups-040-charging.png +%%DATADIR%%/icons/hicolor/32x32/status/gpm-ups-040.png +%%DATADIR%%/icons/hicolor/32x32/status/gpm-ups-060-charging.png +%%DATADIR%%/icons/hicolor/32x32/status/gpm-ups-060.png +%%DATADIR%%/icons/hicolor/32x32/status/gpm-ups-080-charging.png +%%DATADIR%%/icons/hicolor/32x32/status/gpm-ups-080.png +%%DATADIR%%/icons/hicolor/32x32/status/gpm-ups-100-charging.png +%%DATADIR%%/icons/hicolor/32x32/status/gpm-ups-100.png +%%DATADIR%%/icons/hicolor/32x32/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-battery-000-charging.png +%%DATADIR%%/icons/hicolor/48x48/status/gpm-battery-000.png +%%DATADIR%%/icons/hicolor/48x48/status/gpm-battery-020-charging.png +%%DATADIR%%/icons/hicolor/48x48/status/gpm-battery-020.png +%%DATADIR%%/icons/hicolor/48x48/status/gpm-battery-040-charging.png +%%DATADIR%%/icons/hicolor/48x48/status/gpm-battery-040.png +%%DATADIR%%/icons/hicolor/48x48/status/gpm-battery-060-charging.png +%%DATADIR%%/icons/hicolor/48x48/status/gpm-battery-060.png +%%DATADIR%%/icons/hicolor/48x48/status/gpm-battery-080-charging.png +%%DATADIR%%/icons/hicolor/48x48/status/gpm-battery-080.png +%%DATADIR%%/icons/hicolor/48x48/status/gpm-battery-100-charging.png +%%DATADIR%%/icons/hicolor/48x48/status/gpm-battery-100.png +%%DATADIR%%/icons/hicolor/48x48/status/gpm-battery-charged.png +%%DATADIR%%/icons/hicolor/48x48/status/gpm-battery-empty.png +%%DATADIR%%/icons/hicolor/48x48/status/gpm-battery-missing.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 @@ -184,31 +271,24 @@ share/gnome-2.0/ui/GNOME_InhibitApplet.xml %%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-020.png +%%DATADIR%%/icons/hicolor/48x48/status/gpm-keyboard-040.png %%DATADIR%%/icons/hicolor/48x48/status/gpm-keyboard-060.png +%%DATADIR%%/icons/hicolor/48x48/status/gpm-keyboard-080.png %%DATADIR%%/icons/hicolor/48x48/status/gpm-keyboard-100.png +%%DATADIR%%/icons/hicolor/48x48/status/gpm-monitor.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-020.png +%%DATADIR%%/icons/hicolor/48x48/status/gpm-mouse-040.png %%DATADIR%%/icons/hicolor/48x48/status/gpm-mouse-060.png +%%DATADIR%%/icons/hicolor/48x48/status/gpm-mouse-080.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-020.png +%%DATADIR%%/icons/hicolor/48x48/status/gpm-phone-040.png %%DATADIR%%/icons/hicolor/48x48/status/gpm-phone-060.png +%%DATADIR%%/icons/hicolor/48x48/status/gpm-phone-080.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 @@ -221,11 +301,26 @@ share/gnome-2.0/ui/GNOME_InhibitApplet.xml %%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/icon-theme.cache %%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-battery-000-charging.svg +%%DATADIR%%/icons/hicolor/scalable/status/gpm-battery-000.svg +%%DATADIR%%/icons/hicolor/scalable/status/gpm-battery-020-charging.svg +%%DATADIR%%/icons/hicolor/scalable/status/gpm-battery-020.svg +%%DATADIR%%/icons/hicolor/scalable/status/gpm-battery-040-charging.svg +%%DATADIR%%/icons/hicolor/scalable/status/gpm-battery-040.svg +%%DATADIR%%/icons/hicolor/scalable/status/gpm-battery-060-charging.svg +%%DATADIR%%/icons/hicolor/scalable/status/gpm-battery-060.svg +%%DATADIR%%/icons/hicolor/scalable/status/gpm-battery-080-charging.svg +%%DATADIR%%/icons/hicolor/scalable/status/gpm-battery-080.svg +%%DATADIR%%/icons/hicolor/scalable/status/gpm-battery-100-charging.svg +%%DATADIR%%/icons/hicolor/scalable/status/gpm-battery-100.svg +%%DATADIR%%/icons/hicolor/scalable/status/gpm-battery-charged.svg +%%DATADIR%%/icons/hicolor/scalable/status/gpm-battery-empty.svg +%%DATADIR%%/icons/hicolor/scalable/status/gpm-battery-missing.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 @@ -235,31 +330,15 @@ share/gnome-2.0/ui/GNOME_InhibitApplet.xml %%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-monitor.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 @@ -272,9 +351,7 @@ share/gnome-2.0/ui/GNOME_InhibitApplet.xml %%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 @@ -304,6 +381,48 @@ 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/de/figures/applet-brightness.png +share/gnome/help/gnome-power-manager/de/figures/applet-inhibit.png +share/gnome/help/gnome-power-manager/de/figures/gpm-cell-capacity.png +share/gnome/help/gnome-power-manager/de/figures/gpm-charged.png +share/gnome/help/gnome-power-manager/de/figures/gpm-critical.png +share/gnome/help/gnome-power-manager/de/figures/gpm-low.png +share/gnome/help/gnome-power-manager/de/figures/gpm-prefs-ac.png +share/gnome/help/gnome-power-manager/de/figures/gpm-prefs-battery.png +share/gnome/help/gnome-power-manager/de/figures/gpm-prefs-general.png +share/gnome/help/gnome-power-manager/de/figures/gpm-stats-graph.png +share/gnome/help/gnome-power-manager/de/figures/gpm-suspend-problem.png +share/gnome/help/gnome-power-manager/de/figures/gpm-unplugged.png +share/gnome/help/gnome-power-manager/de/figures/gs-prefs.png +share/gnome/help/gnome-power-manager/de/gnome-power-manager.xml +share/gnome/help/gnome-power-manager/el/figures/applet-brightness.png +share/gnome/help/gnome-power-manager/el/figures/applet-inhibit.png +share/gnome/help/gnome-power-manager/el/figures/gpm-cell-capacity.png +share/gnome/help/gnome-power-manager/el/figures/gpm-charged.png +share/gnome/help/gnome-power-manager/el/figures/gpm-critical.png +share/gnome/help/gnome-power-manager/el/figures/gpm-low.png +share/gnome/help/gnome-power-manager/el/figures/gpm-prefs-ac.png +share/gnome/help/gnome-power-manager/el/figures/gpm-prefs-battery.png +share/gnome/help/gnome-power-manager/el/figures/gpm-prefs-general.png +share/gnome/help/gnome-power-manager/el/figures/gpm-stats-graph.png +share/gnome/help/gnome-power-manager/el/figures/gpm-suspend-problem.png +share/gnome/help/gnome-power-manager/el/figures/gpm-unplugged.png +share/gnome/help/gnome-power-manager/el/figures/gs-prefs.png +share/gnome/help/gnome-power-manager/el/gnome-power-manager.xml +share/gnome/help/gnome-power-manager/en_GB/figures/applet-brightness.png +share/gnome/help/gnome-power-manager/en_GB/figures/applet-inhibit.png +share/gnome/help/gnome-power-manager/en_GB/figures/gpm-cell-capacity.png +share/gnome/help/gnome-power-manager/en_GB/figures/gpm-charged.png +share/gnome/help/gnome-power-manager/en_GB/figures/gpm-critical.png +share/gnome/help/gnome-power-manager/en_GB/figures/gpm-low.png +share/gnome/help/gnome-power-manager/en_GB/figures/gpm-prefs-ac.png +share/gnome/help/gnome-power-manager/en_GB/figures/gpm-prefs-battery.png +share/gnome/help/gnome-power-manager/en_GB/figures/gpm-prefs-general.png +share/gnome/help/gnome-power-manager/en_GB/figures/gpm-stats-graph.png +share/gnome/help/gnome-power-manager/en_GB/figures/gpm-suspend-problem.png +share/gnome/help/gnome-power-manager/en_GB/figures/gpm-unplugged.png +share/gnome/help/gnome-power-manager/en_GB/figures/gs-prefs.png +share/gnome/help/gnome-power-manager/en_GB/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 @@ -318,6 +437,34 @@ 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/eu/figures/applet-brightness.png +share/gnome/help/gnome-power-manager/eu/figures/applet-inhibit.png +share/gnome/help/gnome-power-manager/eu/figures/gpm-cell-capacity.png +share/gnome/help/gnome-power-manager/eu/figures/gpm-charged.png +share/gnome/help/gnome-power-manager/eu/figures/gpm-critical.png +share/gnome/help/gnome-power-manager/eu/figures/gpm-low.png +share/gnome/help/gnome-power-manager/eu/figures/gpm-prefs-ac.png +share/gnome/help/gnome-power-manager/eu/figures/gpm-prefs-battery.png +share/gnome/help/gnome-power-manager/eu/figures/gpm-prefs-general.png +share/gnome/help/gnome-power-manager/eu/figures/gpm-stats-graph.png +share/gnome/help/gnome-power-manager/eu/figures/gpm-suspend-problem.png +share/gnome/help/gnome-power-manager/eu/figures/gpm-unplugged.png +share/gnome/help/gnome-power-manager/eu/figures/gs-prefs.png +share/gnome/help/gnome-power-manager/eu/gnome-power-manager.xml +share/gnome/help/gnome-power-manager/fi/figures/applet-brightness.png +share/gnome/help/gnome-power-manager/fi/figures/applet-inhibit.png +share/gnome/help/gnome-power-manager/fi/figures/gpm-cell-capacity.png +share/gnome/help/gnome-power-manager/fi/figures/gpm-charged.png +share/gnome/help/gnome-power-manager/fi/figures/gpm-critical.png +share/gnome/help/gnome-power-manager/fi/figures/gpm-low.png +share/gnome/help/gnome-power-manager/fi/figures/gpm-prefs-ac.png +share/gnome/help/gnome-power-manager/fi/figures/gpm-prefs-battery.png +share/gnome/help/gnome-power-manager/fi/figures/gpm-prefs-general.png +share/gnome/help/gnome-power-manager/fi/figures/gpm-stats-graph.png +share/gnome/help/gnome-power-manager/fi/figures/gpm-suspend-problem.png +share/gnome/help/gnome-power-manager/fi/figures/gpm-unplugged.png +share/gnome/help/gnome-power-manager/fi/figures/gs-prefs.png +share/gnome/help/gnome-power-manager/fi/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 @@ -416,6 +563,20 @@ 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/gnome/help/gnome-power-manager/zh_CN/figures/applet-brightness.png +share/gnome/help/gnome-power-manager/zh_CN/figures/applet-inhibit.png +share/gnome/help/gnome-power-manager/zh_CN/figures/gpm-cell-capacity.png +share/gnome/help/gnome-power-manager/zh_CN/figures/gpm-charged.png +share/gnome/help/gnome-power-manager/zh_CN/figures/gpm-critical.png +share/gnome/help/gnome-power-manager/zh_CN/figures/gpm-low.png +share/gnome/help/gnome-power-manager/zh_CN/figures/gpm-prefs-ac.png +share/gnome/help/gnome-power-manager/zh_CN/figures/gpm-prefs-battery.png +share/gnome/help/gnome-power-manager/zh_CN/figures/gpm-prefs-general.png +share/gnome/help/gnome-power-manager/zh_CN/figures/gpm-stats-graph.png +share/gnome/help/gnome-power-manager/zh_CN/figures/gpm-suspend-problem.png +share/gnome/help/gnome-power-manager/zh_CN/figures/gpm-unplugged.png +share/gnome/help/gnome-power-manager/zh_CN/figures/gs-prefs.png +share/gnome/help/gnome-power-manager/zh_CN/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 @@ -428,6 +589,10 @@ 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/32x32/apps/gnome-brightness-applet.png +share/icons/hicolor/32x32/apps/gnome-inhibit-applet.png +share/icons/hicolor/32x32/apps/gnome-power-manager.png +share/icons/hicolor/32x32/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 @@ -439,17 +604,20 @@ 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/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/ca@valencia/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@shaw/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 @@ -463,6 +631,7 @@ 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/hr/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 @@ -474,6 +643,7 @@ 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/mai/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 @@ -506,7 +676,12 @@ 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-de.omf +share/omf/gnome-power-manager/gnome-power-manager-el.omf +share/omf/gnome-power-manager/gnome-power-manager-en_GB.omf share/omf/gnome-power-manager/gnome-power-manager-es.omf +share/omf/gnome-power-manager/gnome-power-manager-eu.omf +share/omf/gnome-power-manager/gnome-power-manager-fi.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 @@ -514,7 +689,10 @@ 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 +share/omf/gnome-power-manager/gnome-power-manager-zh_CN.omf @dirrm share/omf/gnome-power-manager +@dirrm share/gnome/help/gnome-power-manager/zh_CN/figures +@dirrm share/gnome/help/gnome-power-manager/zh_CN @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 @@ -529,8 +707,18 @@ share/omf/gnome-power-manager/gnome-power-manager-sv.omf @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/fi/figures +@dirrm share/gnome/help/gnome-power-manager/fi +@dirrm share/gnome/help/gnome-power-manager/eu/figures +@dirrm share/gnome/help/gnome-power-manager/eu @dirrm share/gnome/help/gnome-power-manager/es/figures @dirrm share/gnome/help/gnome-power-manager/es +@dirrm share/gnome/help/gnome-power-manager/en_GB/figures +@dirrm share/gnome/help/gnome-power-manager/en_GB +@dirrm share/gnome/help/gnome-power-manager/el/figures +@dirrm share/gnome/help/gnome-power-manager/el +@dirrm share/gnome/help/gnome-power-manager/de/figures +@dirrm share/gnome/help/gnome-power-manager/de @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 @@ -542,6 +730,9 @@ share/omf/gnome-power-manager/gnome-power-manager-sv.omf @dirrm %%DATADIR%%/icons/hicolor/48x48/status @dirrm %%DATADIR%%/icons/hicolor/48x48/actions @dirrm %%DATADIR%%/icons/hicolor/48x48 +@dirrm %%DATADIR%%/icons/hicolor/32x32/status +@dirrm %%DATADIR%%/icons/hicolor/32x32/actions +@dirrm %%DATADIR%%/icons/hicolor/32x32 @dirrm %%DATADIR%%/icons/hicolor/24x24/status @dirrm %%DATADIR%%/icons/hicolor/24x24/actions @dirrm %%DATADIR%%/icons/hicolor/24x24 @@ -554,7 +745,6 @@ share/omf/gnome-power-manager/gnome-power-manager-sv.omf @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 @@ -569,10 +759,16 @@ share/omf/gnome-power-manager/gnome-power-manager-sv.omf @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/en@shaw/LC_MESSAGES +@dirrmtry share/locale/en@shaw @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 diff --git a/sysutils/gnome-settings-daemon/Makefile b/sysutils/gnome-settings-daemon/Makefile index d86ca70b736a..226f0d428c77 100644 --- a/sysutils/gnome-settings-daemon/Makefile +++ b/sysutils/gnome-settings-daemon/Makefile @@ -3,12 +3,11 @@ # Whom: Koop Mast <kwm@FreeBSD.org> # # $FreeBSD$ -# $MCom: ports/sysutils/gnome-settings-daemon/Makefile,v 1.53 2009/11/26 06:20:13 marcus Exp $ +# $MCom: ports/sysutils/gnome-settings-daemon/Makefile,v 1.62 2010/04/26 23:24:41 kwm Exp $ # PORTNAME= gnome-settings-daemon -PORTVERSION= 2.28.1 -PORTREVISION= 4 +PORTVERSION= 2.30.1 CATEGORIES= sysutils gnome MASTER_SITES= GNOME DIST_SUBDIR= gnome2 diff --git a/sysutils/gnome-settings-daemon/distinfo b/sysutils/gnome-settings-daemon/distinfo index 5cced3e1045e..7072a4788336 100644 --- a/sysutils/gnome-settings-daemon/distinfo +++ b/sysutils/gnome-settings-daemon/distinfo @@ -1,3 +1,3 @@ -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 +MD5 (gnome2/gnome-settings-daemon-2.30.1.tar.bz2) = 0a287d63b15bda50c344b3fe9a71c47e +SHA256 (gnome2/gnome-settings-daemon-2.30.1.tar.bz2) = 6f66de1bb80af094a640398549799109e60f53d5373a1b0b7719a5a31c900095 +SIZE (gnome2/gnome-settings-daemon-2.30.1.tar.bz2) = 1246609 diff --git a/sysutils/gnome-settings-daemon/files/patch-plugins_housekeeping_gsd-disk-space.c b/sysutils/gnome-settings-daemon/files/patch-plugins_housekeeping_gsd-disk-space.c deleted file mode 100644 index db87cfc70ff4..000000000000 --- a/sysutils/gnome-settings-daemon/files/patch-plugins_housekeeping_gsd-disk-space.c +++ /dev/null @@ -1,10 +0,0 @@ ---- plugins/housekeeping/gsd-disk-space.c.orig 2009-12-11 12:14:35.000000000 -0500 -+++ plugins/housekeeping/gsd-disk-space.c 2009-12-11 12:14:56.000000000 -0500 -@@ -315,6 +315,7 @@ - "procfs", - "ptyfs", - "selinuxfs", -+ "linsysfs", - "sysfs", - "tmpfs", - "usbfs", diff --git a/sysutils/gnome-settings-daemon/pkg-plist b/sysutils/gnome-settings-daemon/pkg-plist index 3407151e081d..a63c3473679c 100644 --- a/sysutils/gnome-settings-daemon/pkg-plist +++ b/sysutils/gnome-settings-daemon/pkg-plist @@ -65,16 +65,27 @@ share/gnome-control-center/keybindings/50-accessibility.xml %%DATADIR%%/acme.ui %%DATADIR%%/gsd-a11y-preferences-dialog.ui %%DATADIR%%/modmap-dialog.ui +%%DATADIR%%/show-layout.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/actions/touchpad-disabled.png +share/icons/hicolor/16x16/actions/touchpad-enabled.png share/icons/hicolor/16x16/apps/gsd-xrandr.png +share/icons/hicolor/22x22/actions/touchpad-disabled.png +share/icons/hicolor/22x22/actions/touchpad-enabled.png share/icons/hicolor/22x22/apps/gsd-xrandr.png +share/icons/hicolor/24x24/actions/touchpad-disabled.png +share/icons/hicolor/24x24/actions/touchpad-enabled.png share/icons/hicolor/24x24/apps/gsd-xrandr.png +share/icons/hicolor/32x32/actions/touchpad-disabled.png +share/icons/hicolor/32x32/actions/touchpad-enabled.png share/icons/hicolor/32x32/apps/gsd-xrandr.png +share/icons/hicolor/scalable/actions/touchpad-disabled.svg +share/icons/hicolor/scalable/actions/touchpad-enabled.svg 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 @@ -91,12 +102,14 @@ 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/crh/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@shaw/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 @@ -130,6 +143,7 @@ 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/nds/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 @@ -185,6 +199,8 @@ share/locale/zu/LC_MESSAGES/gnome-settings-daemon.mo @dirrmtry share/locale/oc @dirrmtry share/locale/nso/LC_MESSAGES @dirrmtry share/locale/nso +@dirrmtry share/locale/nds/LC_MESSAGES +@dirrmtry share/locale/nds @dirrmtry share/locale/mr/LC_MESSAGES @dirrmtry share/locale/mr @dirrmtry share/locale/mg/LC_MESSAGES @@ -193,8 +209,12 @@ share/locale/zu/LC_MESSAGES/gnome-settings-daemon.mo @dirrmtry share/locale/mai @dirrmtry share/locale/ku/LC_MESSAGES @dirrmtry share/locale/ku +@dirrmtry share/locale/en@shaw/LC_MESSAGES +@dirrmtry share/locale/en@shaw @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 diff --git a/sysutils/gnome-system-monitor/Makefile b/sysutils/gnome-system-monitor/Makefile index eadbfc25dfd6..9ac0b17f3d92 100644 --- a/sysutils/gnome-system-monitor/Makefile +++ b/sysutils/gnome-system-monitor/Makefile @@ -3,12 +3,11 @@ # Whom: Joe Marcus Clarke <marcus@FreeBSD.org> # # $FreeBSD$ -# $MCom: ports/sysutils/gnome-system-monitor/Makefile,v 1.137 2009/09/21 09:37:19 kwm Exp $ +# $MCom: ports/sysutils/gnome-system-monitor/Makefile,v 1.139 2010/04/01 13:05:19 kwm Exp $ # PORTNAME= gnome-system-monitor -PORTVERSION= 2.28.0 -PORTREVISION= 2 +PORTVERSION= 2.28.1 CATEGORIES= sysutils gnome MASTER_SITES= GNOME DIST_SUBDIR= gnome2 diff --git a/sysutils/gnome-system-monitor/distinfo b/sysutils/gnome-system-monitor/distinfo index 9c0250230f41..925fc1787965 100644 --- a/sysutils/gnome-system-monitor/distinfo +++ b/sysutils/gnome-system-monitor/distinfo @@ -1,3 +1,3 @@ -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 +MD5 (gnome2/gnome-system-monitor-2.28.1.tar.bz2) = 064cf1a97d3dd1946bc3e55d8272c2c8 +SHA256 (gnome2/gnome-system-monitor-2.28.1.tar.bz2) = 25b2566af336c44dc279afd7a522e3616b68047f1a1a34c8a5024a52f894429b +SIZE (gnome2/gnome-system-monitor-2.28.1.tar.bz2) = 2335360 diff --git a/sysutils/gnome-system-monitor/pkg-plist b/sysutils/gnome-system-monitor/pkg-plist index 701940d51541..fe6d662fa1fa 100644 --- a/sysutils/gnome-system-monitor/pkg-plist +++ b/sysutils/gnome-system-monitor/pkg-plist @@ -183,6 +183,20 @@ 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/gnome/help/gnome-system-monitor/zh_CN/figures/addColumn.png +share/gnome/help/gnome-system-monitor/zh_CN/figures/changePriority.png +share/gnome/help/gnome-system-monitor/zh_CN/figures/colorPanel.png +share/gnome/help/gnome-system-monitor/zh_CN/figures/columnContextMenu.png +share/gnome/help/gnome-system-monitor/zh_CN/figures/gnome-system-monitor_window.png +share/gnome/help/gnome-system-monitor/zh_CN/figures/memoryMaps.png +share/gnome/help/gnome-system-monitor/zh_CN/figures/moreInfo.png +share/gnome/help/gnome-system-monitor/zh_CN/figures/processListing.png +share/gnome/help/gnome-system-monitor/zh_CN/figures/sortButton.png +share/gnome/help/gnome-system-monitor/zh_CN/figures/sortMenu.png +share/gnome/help/gnome-system-monitor/zh_CN/figures/sortMenu2.png +share/gnome/help/gnome-system-monitor/zh_CN/figures/systemMonitor.png +share/gnome/help/gnome-system-monitor/zh_CN/figures/viewMenu.png +share/gnome/help/gnome-system-monitor/zh_CN/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 @@ -202,6 +216,7 @@ 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@shaw/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 @@ -235,6 +250,7 @@ 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/nds/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 @@ -278,11 +294,14 @@ 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/omf/gnome-system-monitor/gnome-system-monitor-zh_CN.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/zh_CN/figures +@dirrm share/gnome/help/gnome-system-monitor/zh_CN @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 @@ -327,6 +346,8 @@ share/pixmaps/gnome-system-monitor/upload.svg @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/mg/LC_MESSAGES @@ -335,6 +356,8 @@ share/pixmaps/gnome-system-monitor/upload.svg @dirrmtry share/locale/mai @dirrmtry share/locale/ku/LC_MESSAGES @dirrmtry share/locale/ku +@dirrmtry share/locale/en@shaw/LC_MESSAGES +@dirrmtry share/locale/en@shaw @dirrmtry share/locale/dz/LC_MESSAGES @dirrmtry share/locale/dz @dirrmtry share/locale/ca@valencia/LC_MESSAGES diff --git a/sysutils/gnome-system-tools/Makefile b/sysutils/gnome-system-tools/Makefile index 579d384b054d..a54d417a7092 100644 --- a/sysutils/gnome-system-tools/Makefile +++ b/sysutils/gnome-system-tools/Makefile @@ -3,12 +3,11 @@ # Whom: Adam Weinberger <adamw@FreeBSD.org> # # $FreeBSD$ -# $MCom: ports/sysutils/gnome-system-tools/Makefile,v 1.88 2009/10/19 18:43:32 kwm Exp $ +# $MCom: ports/sysutils/gnome-system-tools/Makefile,v 1.97 2010/04/27 17:44:05 kwm Exp $ # PORTNAME= gnome-system-tools -PORTVERSION= 2.28.2 -PORTREVISION= 2 +PORTVERSION= 2.30.1 CATEGORIES= sysutils gnome MASTER_SITES= GNOME DIST_SUBDIR= gnome2 diff --git a/sysutils/gnome-system-tools/distinfo b/sysutils/gnome-system-tools/distinfo index 0e35df51b97c..8fb8a76b1b78 100644 --- a/sysutils/gnome-system-tools/distinfo +++ b/sysutils/gnome-system-tools/distinfo @@ -1,3 +1,3 @@ -MD5 (gnome2/gnome-system-tools-2.28.2.tar.bz2) = 6947cd83c8f83af54e76a36ab3bb6cf0 -SHA256 (gnome2/gnome-system-tools-2.28.2.tar.bz2) = 806dd14792149b7f01e84a214b8d6debda53965e1eb74d189c66498adeb2af29 -SIZE (gnome2/gnome-system-tools-2.28.2.tar.bz2) = 5307176 +MD5 (gnome2/gnome-system-tools-2.30.1.tar.bz2) = d752a0bc2e075ba6d99fbf5d609051cc +SHA256 (gnome2/gnome-system-tools-2.30.1.tar.bz2) = c70c2282275d54793c65cffe51ad84d2586b13eb49e4c7d4fa94e7d2edbebc70 +SIZE (gnome2/gnome-system-tools-2.30.1.tar.bz2) = 5380453 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 index bfc0d5eaa8b3..c9fcbb6537dd 100644 --- a/sysutils/gnome-system-tools/files/patch-src_users_user-settings.c +++ b/sysutils/gnome-system-tools/files/patch-src_users_user-settings.c @@ -1,33 +1,31 @@ ---- src/users/user-settings.c.orig 2009-12-15 05:17:23.000000000 -0800 -+++ src/users/user-settings.c 2010-01-20 22:25:39.000000000 -0800 -@@ -29,7 +29,7 @@ +--- src/users/user-settings.c.orig 2010-01-11 19:53:32.000000000 +0100 ++++ src/users/user-settings.c 2010-01-20 15:42:10.000000000 +0100 +@@ -31,7 +31,15 @@ #include <sys/types.h> #include <sys/stat.h> #include <stdlib.h> --#include <utmp.h> -+#include <sys/param.h> ++#ifdef __FreeBSD__ ++# include <sys/param.h> ++# if __FreeBSD_version >= 900007 ++# define HAVE_UTMPX_H ++#include <utmpx.h> ++# else + #include <utmp.h> ++# endif ++#endif #include <ctype.h> #include "users-table.h" -@@ -367,7 +367,7 @@ +@@ -274,10 +282,10 @@ static void + set_login_length (GtkWidget *entry) { gint max_len; - #ifdef __FreeBSD__ -- max_len = UT_NAMESIZE; -+ max_len = MAXLOGNAME - 1; +-#ifdef __FreeBSD__ ++#if (defined(__FreeBSD__) && !defined(HAVE_UTMPX_H)) + max_len = UT_NAMESIZE; #else - struct utmp ut; +- struct utmp ut; ++ struct utmpx ut; -@@ -819,10 +819,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)); + max_len = sizeof (ut.ut_user); + #endif diff --git a/sysutils/gnome-system-tools/pkg-plist b/sysutils/gnome-system-tools/pkg-plist index 5f0f345bcae0..0bfaa9786591 100644 --- a/sysutils/gnome-system-tools/pkg-plist +++ b/sysutils/gnome-system-tools/pkg-plist @@ -3,6 +3,7 @@ bin/services-admin bin/shares-admin bin/time-admin bin/users-admin +etc/gnome-system-tools/user-profiles.conf 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 @@ -63,7 +64,6 @@ 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 @@ -231,6 +231,7 @@ 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/af/LC_MESSAGES/gnome-system-tools.mo 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 @@ -241,6 +242,7 @@ 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/br/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 @@ -249,6 +251,7 @@ 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@shaw/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 @@ -536,6 +539,7 @@ share/omf/users-admin/users-admin-zh_CN.omf @dirrm %%DATADIR%%/pixmaps @dirrm %%DATADIR%% @dirrmtry share/applications +@dirrm etc/gnome-system-tools @dirrmtry share/locale/zh_HK/LC_MESSAGES @dirrmtry share/locale/zh_HK @dirrmtry share/locale/xh/LC_MESSAGES @@ -562,6 +566,8 @@ share/omf/users-admin/users-admin-zh_CN.omf @dirrmtry share/locale/mai @dirrmtry share/locale/ku/LC_MESSAGES @dirrmtry share/locale/ku +@dirrmtry share/locale/en@shaw/LC_MESSAGES +@dirrmtry share/locale/en@shaw @dirrmtry share/locale/dz/LC_MESSAGES @dirrmtry share/locale/dz @dirrmtry share/locale/ca@valencia/LC_MESSAGES diff --git a/sysutils/hal-info/Makefile b/sysutils/hal-info/Makefile index 8044c7f7df95..1bb513e5a3db 100644 --- a/sysutils/hal-info/Makefile +++ b/sysutils/hal-info/Makefile @@ -3,12 +3,11 @@ # Whom: Joe Marcus Clarke <marcus@FreeBSD.org> # # $FreeBSD$ -# $MCom: ports/sysutils/hal-info/Makefile,v 1.3 2008/03/17 22:31:58 marcus Exp $ +# $MCom: ports/sysutils/hal-info/Makefile,v 1.6 2010/03/16 19:33:11 mezz Exp $ # PORTNAME= hal-info -PORTVERSION= 20080508 -PORTREVISION= 1 +PORTVERSION= 20091130 CATEGORIES= sysutils MASTER_SITES= http://hal.freedesktop.org/releases/ diff --git a/sysutils/hal-info/distinfo b/sysutils/hal-info/distinfo index e558d0002b3e..62258e16fb15 100644 --- a/sysutils/hal-info/distinfo +++ b/sysutils/hal-info/distinfo @@ -1,3 +1,3 @@ -MD5 (hal-info-20080508.tar.gz) = 6fc99d15d38945c17a291ea93e664664 -SHA256 (hal-info-20080508.tar.gz) = 80655b3531ea56a5d64085e572dfb8d3ecabffd28af482cd130f72dfdd6254b0 -SIZE (hal-info-20080508.tar.gz) = 202719 +MD5 (hal-info-20091130.tar.gz) = 34375489a02a00b250fdc0b280be11b8 +SHA256 (hal-info-20091130.tar.gz) = 3b5a90eaea4359977d36c808a19b3f08835345a258c68b9c6c080ad5ef875224 +SIZE (hal-info-20091130.tar.gz) = 144859 diff --git a/sysutils/hal-info/files/patch-configure b/sysutils/hal-info/files/patch-configure index 99c9d9d0a7dc..0a256b677af7 100644 --- a/sysutils/hal-info/files/patch-configure +++ b/sysutils/hal-info/files/patch-configure @@ -1,83 +1,110 @@ ---- configure.orig 2008-05-19 02:26:02.000000000 -0400 -+++ configure 2008-05-19 02:26:27.000000000 -0400 -@@ -3485,7 +3485,7 @@ fi - - - --if test x$enable_recall == xyes; then -+if test x$enable_recall = xyes; then +--- configure.orig 2009-12-25 12:13:27.000000000 -0500 ++++ configure 2009-12-25 12:14:19.000000000 -0500 +@@ -3397,7 +3397,7 @@ else + enable_recall=yes + fi + +- if test x$enable_recall == xyes; then ++ if test x$enable_recall = xyes; then BUILD_RECALL_TRUE= BUILD_RECALL_FALSE='#' else -@@ -3503,7 +3503,7 @@ fi +@@ -3413,7 +3413,7 @@ else + enable_video=yes + fi - - --if test x$enable_video == xyes; then -+if test x$enable_video = xyes; then +- if test x$enable_video == xyes; then ++ if test x$enable_video = xyes; then BUILD_VIDEO_TRUE= BUILD_VIDEO_FALSE='#' else -@@ -3521,7 +3521,7 @@ fi - - +@@ -3429,7 +3429,7 @@ else + enable_video_nvidia_quirks=yes + fi + +- if test x$enable_video_nvidia_quirks == xyes; then ++ if test x$enable_video_nvidia_quirks = xyes; then + BUILD_VIDEO_NVIDIA_QUIRKS_TRUE= + BUILD_VIDEO_NVIDIA_QUIRKS_FALSE='#' + else +@@ -3445,7 +3445,7 @@ else + enable_video_default_quirks=yes + fi + +- if test x$enable_video_default_quirks == xyes; then ++ if test x$enable_video_default_quirks = xyes; then + BUILD_VIDEO_DEFAULT_QUIRKS_TRUE= + BUILD_VIDEO_DEFAULT_QUIRKS_FALSE='#' + else +@@ -3461,7 +3461,7 @@ else + enable_keymaps=yes + fi --if test x$enable_keymaps == xyes; then -+if test x$enable_keymaps = xyes; then +- if test x$enable_keymaps == xyes; then ++ if test x$enable_keymaps = xyes; then BUILD_KEYMAPS_TRUE= BUILD_KEYMAPS_FALSE='#' else -@@ -3539,7 +3539,7 @@ fi - - +@@ -3477,7 +3477,7 @@ else + enable_killswitch_dell_wlan=yes + fi --if test x$enable_killswitch_dell_wlan == xyes; then -+if test x$enable_killswitch_dell_wlan = xyes; then +- if test x$enable_killswitch_dell_wlan == xyes; then ++ if test x$enable_killswitch_dell_wlan = xyes; then BUILD_KILLSWITCH_DELL_WLAN_TRUE= BUILD_KILLSWITCH_DELL_WLAN_FALSE='#' else -@@ -3557,7 +3557,7 @@ fi +@@ -3493,7 +3493,7 @@ else + enable_killswitch_dell_bluetooth=yes + fi - - --if test x$enable_killswitch_dell_bluetooth == xyes; then -+if test x$enable_killswitch_dell_bluetooth = xyes; then +- if test x$enable_killswitch_dell_bluetooth == xyes; then ++ if test x$enable_killswitch_dell_bluetooth = xyes; then BUILD_KILLSWITCH_DELL_BLUETOOTH_TRUE= BUILD_KILLSWITCH_DELL_BLUETOOTH_FALSE='#' else -@@ -3575,7 +3575,7 @@ fi - +@@ -3509,7 +3509,7 @@ else + enable_killswitch_dell_wwan=yes + fi - --if test x$enable_killswitch_dell_wwan == xyes; then -+if test x$enable_killswitch_dell_wwan = xyes; then +- if test x$enable_killswitch_dell_wwan == xyes; then ++ if test x$enable_killswitch_dell_wwan = xyes; then BUILD_KILLSWITCH_DELL_WWAN_TRUE= BUILD_KILLSWITCH_DELL_WWAN_FALSE='#' else -@@ -3593,7 +3593,7 @@ fi - - +@@ -3525,7 +3525,7 @@ else + enable_killswitch_sony_bluetooth=yes + fi --if test x$enable_killswitch_sony_bluetooth == xyes; then -+if test x$enable_killswitch_sony_bluetooth = xyes; then +- if test x$enable_killswitch_sony_bluetooth == xyes; then ++ if test x$enable_killswitch_sony_bluetooth = xyes; then BUILD_KILLSWITCH_SONY_BLUETOOTH_TRUE= BUILD_KILLSWITCH_SONY_BLUETOOTH_FALSE='#' else -@@ -3611,7 +3611,7 @@ fi +@@ -3541,7 +3541,7 @@ else + enable_killswitch_thinkpad_bluetooth=yes + fi - - --if test x$enable_killswitch_thinkpad_bluetooth == xyes; then -+if test x$enable_killswitch_thinkpad_bluetooth = xyes; then +- if test x$enable_killswitch_thinkpad_bluetooth == xyes; then ++ if test x$enable_killswitch_thinkpad_bluetooth = xyes; then BUILD_KILLSWITCH_THINKPAD_BLUETOOTH_TRUE= BUILD_KILLSWITCH_THINKPAD_BLUETOOTH_FALSE='#' else -@@ -3629,7 +3629,7 @@ fi - +@@ -3557,7 +3557,7 @@ else + enable_killswitch_ipw_wlan=yes + fi - --if test x$enable_killswitch_ipw_wlan == xyes; then -+if test x$enable_killswitch_ipw_wlan = xyes; then +- if test x$enable_killswitch_ipw_wlan == xyes; then ++ if test x$enable_killswitch_ipw_wlan = xyes; then BUILD_KILLSWITCH_IPW_WLAN_TRUE= BUILD_KILLSWITCH_IPW_WLAN_FALSE='#' else +@@ -3573,7 +3573,7 @@ else + enable_killswitch_iwl_wlan=yes + fi + +- if test x$enable_killswitch_iwl_wlan == xyes; then ++ if test x$enable_killswitch_iwl_wlan = xyes; then + BUILD_KILLSWITCH_IWL_WLAN_TRUE= + BUILD_KILLSWITCH_IWL_WLAN_FALSE='#' + else diff --git a/sysutils/hal-info/pkg-plist b/sysutils/hal-info/pkg-plist index b48a5514f0db..35e2b64a2577 100644 --- a/sysutils/hal-info/pkg-plist +++ b/sysutils/hal-info/pkg-plist @@ -1,9 +1,11 @@ +share/hal/fdi/information/10freedesktop/10-battery.fdi share/hal/fdi/information/10freedesktop/10-camera-ptp.fdi share/hal/fdi/information/10freedesktop/10-cd-dvd-burner.fdi share/hal/fdi/information/10freedesktop/10-dell-rfkill-switch-bluetooth.fdi share/hal/fdi/information/10freedesktop/10-dell-rfkill-switch-wlan.fdi share/hal/fdi/information/10freedesktop/10-dell-rfkill-switch-wwan.fdi share/hal/fdi/information/10freedesktop/10-ipw-rfkill-switch.fdi +share/hal/fdi/information/10freedesktop/10-iwl-rfkill-switch.fdi share/hal/fdi/information/10freedesktop/10-laptop-panel-hardware.fdi share/hal/fdi/information/10freedesktop/10-modem.fdi share/hal/fdi/information/10freedesktop/10-recall-battery-dell.fdi @@ -12,10 +14,12 @@ share/hal/fdi/information/10freedesktop/10-recall-battery-gateway.fdi share/hal/fdi/information/10freedesktop/10-recall-battery-ibm.fdi share/hal/fdi/information/10freedesktop/10-recall-battery-lenovo.fdi share/hal/fdi/information/10freedesktop/10-recall-battery-toshiba.fdi +share/hal/fdi/information/10freedesktop/10-scanner.fdi share/hal/fdi/information/10freedesktop/10-sony-bluetooth-switch.fdi share/hal/fdi/information/10freedesktop/10-thinkpad-rfkill-switch-bluetooth.fdi share/hal/fdi/information/10freedesktop/10-usb-card-readers.fdi share/hal/fdi/information/10freedesktop/10-usb-music-players.fdi +share/hal/fdi/information/10freedesktop/10-usb-obex.fdi share/hal/fdi/information/10freedesktop/10-usb-pda.fdi share/hal/fdi/information/10freedesktop/10-usb-zip-drives.fdi share/hal/fdi/information/10freedesktop/10-usbcsr-mice.fdi @@ -31,14 +35,15 @@ share/hal/fdi/information/10freedesktop/20-video-quirk-pm-misc.fdi share/hal/fdi/information/10freedesktop/20-video-quirk-pm-samsung.fdi share/hal/fdi/information/10freedesktop/20-video-quirk-pm-sony.fdi share/hal/fdi/information/10freedesktop/20-video-quirk-pm-toshiba.fdi +share/hal/fdi/information/10freedesktop/21-video-quirk-nvidia.fdi share/hal/fdi/information/10freedesktop/30-keymap-acer.fdi share/hal/fdi/information/10freedesktop/30-keymap-compaq.fdi share/hal/fdi/information/10freedesktop/30-keymap-dell.fdi share/hal/fdi/information/10freedesktop/30-keymap-hp.fdi share/hal/fdi/information/10freedesktop/30-keymap-lenovo.fdi share/hal/fdi/information/10freedesktop/30-keymap-misc.fdi -share/hal/fdi/information/10freedesktop/30-keymap-module-asus-laptop.fdi share/hal/fdi/information/10freedesktop/30-keymap-module-sony-laptop.fdi share/hal/fdi/information/10freedesktop/30-keymap-module-thinkpad-acpi.fdi +share/hal/fdi/information/10freedesktop/99-video-quirk-default.fdi share/hal/fdi/preprobe/10osvendor/10-ide-drives.fdi share/hal/fdi/preprobe/10osvendor/20-broken-usb-sticks.fdi diff --git a/sysutils/hal/Makefile b/sysutils/hal/Makefile index ee991fead991..882be329be50 100644 --- a/sysutils/hal/Makefile +++ b/sysutils/hal/Makefile @@ -3,18 +3,19 @@ # Whom: Joe Marcus Clarke <marcus@FreeBSD.org> # # $FreeBSD$ -# $MCom: ports/sysutils/hal/Makefile,v 1.72 2009/11/28 05:59:03 mezz Exp $ +# $MCom: ports/sysutils/hal/Makefile,v 1.81 2010/04/13 02:49:07 mezz Exp $ # PORTNAME= hal -DISTVERSION= 0.5.13 -PORTREVISION= 14 +DISTVERSION= 0.5.14 +PORTREVISION= 7 CATEGORIES= sysutils MASTER_SITES= http://hal.freedesktop.org/releases/ MAINTAINER= gnome@FreeBSD.org COMMENT= Hardware Abstraction Layer for simplifying device access +BUILD_DEPENDS= ${LOCALBASE}/include/linux/videodev2.h:${PORTSDIR}/multimedia/v4l_compat LIB_DEPENDS= polkit.2:${PORTSDIR}/sysutils/policykit \ volume_id.0:${PORTSDIR}/devel/libvolume_id \ ck-connector.0:${PORTSDIR}/sysutils/consolekit diff --git a/sysutils/hal/distinfo b/sysutils/hal/distinfo index 5885af28aef5..ff1858776cda 100644 --- a/sysutils/hal/distinfo +++ b/sysutils/hal/distinfo @@ -1,3 +1,3 @@ -MD5 (hal-0.5.13.tar.gz) = 46ecc5d2e5bd964fb78099688f01bb6a -SHA256 (hal-0.5.13.tar.gz) = ebcf22a373761530920643add1a791af40954dc7349f027d1c35b0e0f7f9c8af -SIZE (hal-0.5.13.tar.gz) = 1199224 +MD5 (hal-0.5.14.tar.gz) = e9163df591a6f38f59fdbfe33e73bf20 +SHA256 (hal-0.5.14.tar.gz) = 323aacfa52f12def3b0d1e76456e34f027c345adc344aad19a8cc0c59c1a8d02 +SIZE (hal-0.5.14.tar.gz) = 1238766 diff --git a/sysutils/hal/files/hald.in b/sysutils/hal/files/hald.in index 82ab1efb1f3b..97dece85c5ff 100644 --- a/sysutils/hal/files/hald.in +++ b/sysutils/hal/files/hald.in @@ -1,10 +1,10 @@ #!/bin/sh # # $FreeBSD$ -# $MCom: ports/sysutils/hal/files/hald.in,v 1.17 2009/09/26 13:42:01 marcus Exp $ +# $MCom: ports/sysutils/hal/files/hald.in,v 1.22 2010/04/17 19:05:10 marcus Exp $ # # PROVIDE: hald -# REQUIRE: DAEMON usbd devd dbus moused +# REQUIRE: DAEMON usbd devd dbus moused webcamd # # Add the following line to /etc/rc.conf to enable the HAL daemon: # diff --git a/sysutils/hal/files/patch-Makefile.in b/sysutils/hal/files/patch-Makefile.in index 17d23980f55c..46b74a5b1a0c 100644 --- a/sysutils/hal/files/patch-Makefile.in +++ b/sysutils/hal/files/patch-Makefile.in @@ -1,24 +1,30 @@ ---- 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: +--- Makefile.in.orig 2009-12-23 13:39:15.000000000 -0500 ++++ Makefile.in 2009-12-23 13:39:58.000000000 -0500 +@@ -379,17 +379,17 @@ clean-libtool: distclean-libtool: - -rm -f libtool + -rm -f libtool config.lt install-dist_dbusDATA: $(dist_dbus_DATA) - @$(NORMAL_INSTALL) - test -z "$(dbusdir)" || $(MKDIR_P) "$(DESTDIR)$(dbusdir)" -- @list='$(dist_dbus_DATA)'; for p in $$list; do \ +- @list='$(dist_dbus_DATA)'; test -n "$(dbusdir)" || list=; \ +- 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"; \ +- echo "$$d$$p"; \ +- done | $(am__base_list) | \ +- while read files; do \ +- echo " $(INSTALL_DATA) $$files '$(DESTDIR)$(dbusdir)'"; \ +- $(INSTALL_DATA) $$files "$(DESTDIR)$(dbusdir)" || exit $$?; \ - done +# @$(NORMAL_INSTALL) +# test -z "$(dbusdir)" || $(MKDIR_P) "$(DESTDIR)$(dbusdir)" -+# @list='$(dist_dbus_DATA)'; for p in $$list; do \ ++# @list='$(dist_dbus_DATA)'; test -n "$(dbusdir)" || list=; \ ++# 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"; \ ++# echo "$$d$$p"; \ ++# done | $(am__base_list) | \ ++# while read files; do \ ++# echo " $(INSTALL_DATA) $$files '$(DESTDIR)$(dbusdir)'"; \ ++# $(INSTALL_DATA) $$files "$(DESTDIR)$(dbusdir)" || exit $$?; \ +# done uninstall-dist_dbusDATA: diff --git a/sysutils/hal/files/patch-config.h.in b/sysutils/hal/files/patch-config.h.in deleted file mode 100644 index e1208c9f9d8e..000000000000 --- 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 bc4df6d96423..000000000000 --- 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 84e12d18796b..000000000000 --- 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-hald_freebsd_Makefile.am b/sysutils/hal/files/patch-hald_freebsd_Makefile.am deleted file mode 100644 index 9a6b8c83d336..000000000000 --- 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 44dbf8adc88a..000000000000 --- 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 f554c0650f3e..000000000000 --- 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 f3a14ac70051..000000000000 --- 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$ -+ * -+ * 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 index f19b7e92dcea..fed388c953ef 100644 --- a/sysutils/hal/files/patch-hald_freebsd_addons_addon-storage.c +++ b/sysutils/hal/files/patch-hald_freebsd_addons_addon-storage.c @@ -1,33 +1,6 @@ ---- 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) +--- hald/freebsd/addons/addon-storage.c.orig 2009-08-24 08:42:29.000000000 -0400 ++++ hald/freebsd/addons/addon-storage.c 2009-12-23 13:53:00.000000000 -0500 +@@ -107,8 +107,7 @@ hf_addon_storage_update (void) if (hf_addon_storage_cdrom_eject_pressed(cdrom)) { @@ -37,165 +10,63 @@ } hfp_cdrom_free(cdrom); -@@ -144,18 +150,142 @@ hf_addon_storage_update (void) - } - } +@@ -164,19 +163,17 @@ unmount_volumes (void) + "block.storage_device", + hfp_udi, + &num_volumes, +- &hfp_error)) != NULL) ++ NULL)) != NULL) + { + int i; -- hfp_gettimeofday(&addon.next_update); -- hfp_timevaladd(&addon.next_update, &addon.update_interval); +- dbus_error_free(&hfp_error); - - return has_media; - } + for (i = 0; i < num_volumes; i++) + { + char *vol_udi; -+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]; -+ + vol_udi = volumes[i]; + +- if (libhal_device_get_property_bool(hfp_ctx, vol_udi, "volume.is_mounted", &hfp_error)) + 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; + { + DBusMessage *msg = NULL; + DBusMessage *reply = NULL; +@@ -185,7 +182,6 @@ unmount_volumes (void) + char **options = NULL; + char *devfile; + +- dbus_error_free(&hfp_error); + hfp_info("Forcing unmount of volume '%s'", vol_udi); -+ if (check_lock_state) -+ { -+ boolean should_poll; -+ -+ check_lock_state = FALSE; -+ -+ hfp_info("Checking whether device %s is locked by HAL", addon.device_file); + dbus_connection = libhal_ctx_get_dbus_connection(hfp_ctx); +@@ -265,10 +261,9 @@ poll_for_media (boolean check_only, bool + 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", &hfp_error)) + 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; -+ } -+ + { + hfp_info("... device %s is locked by HAL", addon.device_file); +- dbus_error_free(&hfp_error); + is_locked_by_hal = TRUE; + update_proc_title(addon.device_file); + goto skip_check; +@@ -278,10 +273,8 @@ poll_for_media (boolean check_only, bool + hfp_info("... device %s is not locked by HAL", addon.device_file); + is_locked_by_hal = FALSE; + } +- dbus_error_free(&hfp_error); + +- should_poll = libhal_device_get_property_bool(hfp_ctx, hfp_udi, "storage.media_check_enabled", &hfp_error); +- dbus_error_free(&hfp_error); + 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 + polling_disabled = ! should_poll; + update_proc_title(addon.device_file); + } +@@ -314,8 +307,7 @@ poll_for_media (boolean check_only, bool + unmount_volumes(); + #endif - libhal_device_rescan(hfp_ctx, hfp_udi, &hfp_error); - dbus_error_free(&hfp_error); @@ -203,107 +74,22 @@ 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") || +@@ -412,12 +404,10 @@ main (int argc, char **argv) ! strcmp(driver, "cd")))) && ! strcmp(removable, "true"); -- addon.had_media = hf_addon_storage_update(); -+ addon.had_media = poll_for_media(TRUE, FALSE); + 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); +- syscon = dbus_bus_get(DBUS_BUS_SYSTEM, &hfp_error); +- dbus_error_free(&hfp_error); ++ syscon = dbus_bus_get(DBUS_BUS_SYSTEM, NULL); + assert(syscon != NULL); + dbus_connection_set_exit_on_disconnect(syscon, 0); - if (! libhal_device_claim_interface(hfp_ctx, - hfp_udi, -@@ -268,52 +442,43 @@ main (int argc, char **argv) +@@ -452,12 +442,11 @@ main (int argc, char **argv) " <method name=\"CheckForMedia\">\n" " <arg name=\"call_had_sideeffect\" direction=\"out\" type=\"b\"/>\n" " </method>\n", @@ -317,55 +103,3 @@ 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 488283e02e36..000000000000 --- 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 a21095a5f339..000000000000 --- 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 e2921c58aa12..000000000000 --- 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, µ ) == 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 29ed38a7e443..000000000000 --- 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 afc07d63ad4b..000000000000 --- 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 bc7ad871d67d..000000000000 --- 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 ca673b5bc379..000000000000 --- 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 index a3289fbabfeb..8e4d2a1b27c6 100644 --- a/sysutils/hal/files/patch-hald_freebsd_hf-usb.c +++ b/sysutils/hal/files/patch-hald_freebsd_hf-usb.c @@ -1,178 +1,20 @@ ---- 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, +--- hald/freebsd/hf-usb.c.orig 2009-09-17 08:49:46.000000000 -0500 ++++ hald/freebsd/hf-usb.c 2010-03-17 22:20:33.000000000 -0500 +@@ -392,7 +392,7 @@ 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); +- hf_device_set_input(device, "keyboard", "keys", devname); ++ hf_device_set_input(device, "keyboard", "keys", NULL); else if ((devname = hf_usb_get_devname(di, "ums"))) /* USB mouse */ - hf_device_set_input(device, "mouse", devname); + hf_device_set_input(device, "mouse", NULL, 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"); -+} +@@ -908,6 +908,8 @@ + + hal_device_property_set_string(device, "info.category", "video4linux"); + hal_device_add_capability(device, "video4linux"); ++ hal_device_add_capability(device, "video4linux.video_capture"); + hf_device_property_set_string_printf(device, "video4linux.device", "/dev/video%i", unit); + hal_device_property_set_string(device, "info.product", "Video Device"); ++ hal_device_property_set_string(device, "video4linux.version", "1"); + } 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 32861e202f1a..000000000000 --- 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 index 995ca1708c97..af288291db4f 100644 --- a/sysutils/hal/files/patch-hald_freebsd_hf-usb2.c +++ b/sysutils/hal/files/patch-hald_freebsd_hf-usb2.c @@ -1,225 +1,85 @@ ---- hald/freebsd/hf-usb2.c.orig 2010-01-23 14:52:11.000000000 -0500 -+++ hald/freebsd/hf-usb2.c 2010-01-23 14:52:33.000000000 -0500 -@@ -0,0 +1,312 @@ -+/*************************************************************************** -+ * CVSID: $Id$ -+ * -+ * 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_copy_property(parent, "info.product", device, "info.product"); -+ hal_device_copy_property(parent, "info.vendor", device, "info.vendor"); +--- hald/freebsd/hf-usb2.c.orig 2009-08-24 07:42:29.000000000 -0500 ++++ hald/freebsd/hf-usb2.c 2010-03-17 22:25:17.000000000 -0500 +@@ -42,22 +42,6 @@ + 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; +@@ -79,9 +63,9 @@ + + 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"); + hal_device_merge_with_rewrite(device, parent, "usb.", "usb_device."); -+ -+ 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); + + if (hf_device_preprobe(device)) + { +@@ -98,10 +82,10 @@ + if (driver) + { + if (! strcmp(driver, "ukbd")) +- hf_device_set_input(device, "keyboard", NULL); +- else if (! strcmp(driver, "ums")) ++ hf_device_set_input(device, "keyboard", "keys", 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_device_set_input(device, "mouse", devname); ++ hf_device_set_input(device, "mouse", NULL, devname); + hf_runner_run_sync(device, 0, "hald-probe-mouse", NULL); + } + else if (! strcmp(driver, "uhid")) +@@ -133,6 +117,11 @@ + hf_usb_add_webcam_properties(device); + } + } ++ else ++ { ++ /* Try and detect webcamd devices. */ ++ hf_runner_run_sync(device, 0, "hald-probe-video4linux", NULL); + } -+ -+ 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) + + hf_usb_device_compute_udi(device); + hf_device_add(device); +@@ -192,11 +181,12 @@ + addr = libusb20_dev_get_address(pdev); + + if (addr == 1) +- parent = hf_devtree_find_parent_from_info(hald_get_gdl(), "usbus", bus); + 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", + 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, NULL); + 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 || hal_device_property_get_bool(parent, "info.ignore")) + continue; + +@@ -216,7 +206,13 @@ + HalDevice *parent_device; + int bus, addr, pbus, paddr; + +- if (strncmp(name, "ugen", strlen("ugen"))) + if (! parent) + return FALSE; + @@ -227,65 +87,42 @@ + ! 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, + return FALSE; + else if (strncmp(parent, "ugen", strlen("ugen"))) + return TRUE; +@@ -232,7 +228,8 @@ + + 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, NULL); + "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", + + if (parent_device && ! hal_device_property_get_bool(parent_device, + "info.ignore")) +@@ -255,8 +252,6 @@ + + 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; +@@ -265,7 +260,8 @@ + + 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, NULL); + 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; -+} -+ + + if (device) + { +@@ -276,6 +272,23 @@ + return FALSE; + } + +static gboolean +hf_usb2_devd_notify (const char *system, + const char *subsystem, @@ -303,13 +140,14 @@ + 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, + HFHandler hf_usb2_handler = { + .privileged_init = hf_usb2_privileged_init, + .probe = hf_usb2_probe +@@ -283,5 +296,6 @@ + + HFDevdHandler hf_usb2_devd_handler = { + .add = hf_usb2_devd_add, +- .remove = hf_usb2_devd_remove + .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 146a3a3309a1..000000000000 --- 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$ -+ * -+ * 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 index 6ee93b139a6b..4fb0d95b4e85 100644 --- a/sysutils/hal/files/patch-hald_freebsd_hf-volume.c +++ b/sysutils/hal/files/patch-hald_freebsd_hf-volume.c @@ -1,105 +1,16 @@ ---- 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) -+ { +--- hald/freebsd/hf-volume.c.orig 2009-12-23 14:01:00.000000000 -0500 ++++ hald/freebsd/hf-volume.c 2009-12-23 14:01:25.000000000 -0500 +@@ -86,9 +86,12 @@ hf_volume_resolve_fuse (const char *spec + { + if (strcmp(fields[0], special) == 0) + { + char *ret; + + ret = g_strdup(fields[1]); -+ g_strfreev(fields); -+ g_strfreev(lines); + g_strfreev(fields); + g_strfreev(lines); +- return g_strdup(fields[1]); + 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); + } + } + g_strfreev(fields); 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 ade6d2a730ad..000000000000 --- 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 index 091af3c1ca0e..ccb4773de51c 100644 --- a/sysutils/hal/files/patch-hald_freebsd_probing_Makefile.am +++ b/sysutils/hal/files/patch-hald_freebsd_probing_Makefile.am @@ -1,57 +1,27 @@ ---- 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 +--- hald/freebsd/probing/Makefile.am.orig 2009-08-24 08:42:29.000000000 -0400 ++++ hald/freebsd/probing/Makefile.am 2010-02-19 23:08:42.000000000 -0500 +@@ -19,7 +19,8 @@ libexec_PROGRAMS = \ + if HAVE_LIBUSB20 + libexec_PROGRAMS += \ + hald-probe-usb2-device \ +- hald-probe-usb2-interface ++ hald-probe-usb2-interface \ ++ hald-probe-video4linux + 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@ +@@ -38,6 +39,14 @@ hald_probe_usb2_interface_SOURCES = prob + hald_probe_usb2_interface_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 = \ ++hald_probe_video4linux_SOURCES = probe-video4linux.c ++hald_probe_video4linux_CPPFLAGS = \ ++ $(AM_CPPFLAGS) @GLIB_CFLAGS@ ++hald_probe_video4linux_LDADD = \ + $(top_builddir)/hald/freebsd/libprobe/libhald_freebsd_probe.la \ ++ @GLIB_LIBS@ \ + @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 + endif + + hald_probe_mouse_SOURCES = probe-mouse.c diff --git a/sysutils/hal/files/patch-hald_freebsd_probing_Makefile.in b/sysutils/hal/files/patch-hald_freebsd_probing_Makefile.in index 4a8ea2f053e3..de353f177a99 100644 --- a/sysutils/hal/files/patch-hald_freebsd_probing_Makefile.in +++ b/sysutils/hal/files/patch-hald_freebsd_probing_Makefile.in @@ -1,170 +1,564 @@ ---- 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 -+ +--- hald/freebsd/probing/Makefile.in.orig 2010-02-19 23:05:16.000000000 -0500 ++++ hald/freebsd/probing/Makefile.in 2010-02-19 23:14:32.000000000 -0500 +@@ -1,9 +1,8 @@ +-# Makefile.in generated by automake 1.11 from Makefile.am. ++# Makefile.in generated by automake 1.10.1 from Makefile.am. + # @configure_input@ + + # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, +-# 2003, 2004, 2005, 2006, 2007, 2008, 2009 Free Software Foundation, +-# Inc. ++# 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc. + # This Makefile.in is free software; the Free Software Foundation + # gives unlimited permission to copy and/or distribute it, + # with or without modifications, as long as this notice is preserved. +@@ -17,9 +16,8 @@ + + VPATH = @srcdir@ + pkgdatadir = $(datadir)/@PACKAGE@ +-pkgincludedir = $(includedir)/@PACKAGE@ + pkglibdir = $(libdir)/@PACKAGE@ +-pkglibexecdir = $(libexecdir)/@PACKAGE@ ++pkgincludedir = $(includedir)/@PACKAGE@ + am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd + install_sh_DATA = $(install_sh) -c -m 644 + install_sh_PROGRAM = $(install_sh) -c +@@ -44,7 +42,8 @@ host_triplet = @host@ + @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 ++@HALD_COMPILE_FREEBSD_TRUE@@HAVE_LIBUSB20_TRUE@ hald-probe-usb2-interface \ ++@HALD_COMPILE_FREEBSD_TRUE@@HAVE_LIBUSB20_TRUE@ hald-probe-video4linux + 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 +@@ -56,17 +55,15 @@ 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) +-CONFIG_CLEAN_VPATH_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) ++@HALD_COMPILE_FREEBSD_TRUE@@HAVE_LIBUSB20_TRUE@ hald-probe-usb2-interface$(EXEEXT) \ ++@HALD_COMPILE_FREEBSD_TRUE@@HAVE_LIBUSB20_TRUE@ hald-probe-video4linux$(EXEEXT) am__installdirs = "$(DESTDIR)$(libexecdir)" - libexecPROGRAMS_INSTALL = $(INSTALL_PROGRAM) ++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_V_lt = $(am__v_lt_$(V)) +-am__v_lt_ = $(am__v_lt_$(AM_DEFAULT_VERBOSITY)) +-am__v_lt_0 = --silent + 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 +@@ -92,6 +89,10 @@ am__hald_probe_usb2_interface_SOURCES_DI + 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_video4linux_SOURCES_DIST = probe-video4linux.c ++@HAVE_LIBUSB20_TRUE@am_hald_probe_video4linux_OBJECTS = hald_probe_video4linux-probe-video4linux.$(OBJEXT) ++hald_probe_video4linux_OBJECTS = $(am_hald_probe_video4linux_OBJECTS) ++@HAVE_LIBUSB20_TRUE@hald_probe_video4linux_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) \ +@@ -100,40 +101,27 @@ hald_probe_volume_DEPENDENCIES = $(top_b + DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir) + depcomp = $(SHELL) $(top_srcdir)/depcomp + am__depfiles_maybe = depfiles +-am__mv = mv -f + COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \ + $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) +-LTCOMPILE = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \ +- $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) \ +- $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \ +- $(AM_CFLAGS) $(CFLAGS) +-AM_V_CC = $(am__v_CC_$(V)) +-am__v_CC_ = $(am__v_CC_$(AM_DEFAULT_VERBOSITY)) +-am__v_CC_0 = @echo " CC " $@; +-AM_V_at = $(am__v_at_$(V)) +-am__v_at_ = $(am__v_at_$(AM_DEFAULT_VERBOSITY)) +-am__v_at_0 = @ ++LTCOMPILE = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \ ++ --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \ ++ $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) + CCLD = $(CC) +-LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \ +- $(LIBTOOLFLAGS) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \ +- $(AM_LDFLAGS) $(LDFLAGS) -o $@ +-AM_V_CCLD = $(am__v_CCLD_$(V)) +-am__v_CCLD_ = $(am__v_CCLD_$(AM_DEFAULT_VERBOSITY)) +-am__v_CCLD_0 = @echo " CCLD " $@; +-AM_V_GEN = $(am__v_GEN_$(V)) +-am__v_GEN_ = $(am__v_GEN_$(AM_DEFAULT_VERBOSITY)) +-am__v_GEN_0 = @echo " GEN " $@; ++LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \ ++ --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) \ ++ $(LDFLAGS) -o $@ + 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) ++ $(hald_probe_video4linux_SOURCES) $(hald_probe_volume_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) \ + $(am__hald_probe_usb2_device_SOURCES_DIST) \ + $(am__hald_probe_usb2_interface_SOURCES_DIST) \ ++ $(am__hald_probe_video4linux_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 +@@ -142,7 +130,6 @@ ACLOCAL = @ACLOCAL@ + ACPI_ACPID = @ACPI_ACPID@ + ACPI_PROC = @ACPI_PROC@ + AMTAR = @AMTAR@ +-AM_DEFAULT_VERBOSITY = @AM_DEFAULT_VERBOSITY@ + AR = @AR@ + AUTOCONF = @AUTOCONF@ + AUTOHEADER = @AUTOHEADER@ +@@ -222,7 +209,6 @@ PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@ + PACKAGE_NAME = @PACKAGE_NAME@ + PACKAGE_STRING = @PACKAGE_STRING@ + PACKAGE_TARNAME = @PACKAGE_TARNAME@ +-PACKAGE_URL = @PACKAGE_URL@ + PACKAGE_VERSION = @PACKAGE_VERSION@ + PARTED_CFLAGS = @PARTED_CFLAGS@ + PARTED_LIBS = @PARTED_LIBS@ +@@ -325,6 +311,15 @@ hald_probe_hiddev_LDADD = \ + @HAVE_LIBUSB20_TRUE@ $(top_builddir)/hald/freebsd/libprobe/libhald_freebsd_probe.la \ + @HAVE_LIBUSB20_TRUE@ @LIBUSB20_LIBS@ -+@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_video4linux_SOURCES = probe-video4linux.c ++@HAVE_LIBUSB20_TRUE@hald_probe_video4linux_CPPFLAGS = \ ++@HAVE_LIBUSB20_TRUE@ $(AM_CPPFLAGS) @GLIB_CFLAGS@ + -+@HAVE_LIBUSB20_TRUE@hald_probe_usb2_interface_SOURCES = probe-usb2-interface.c -+@HAVE_LIBUSB20_TRUE@hald_probe_usb2_interface_LDADD = \ ++@HAVE_LIBUSB20_TRUE@hald_probe_video4linux_LDADD = \ +@HAVE_LIBUSB20_TRUE@ $(top_builddir)/hald/freebsd/libprobe/libhald_freebsd_probe.la \ ++@HAVE_LIBUSB20_TRUE@ @GLIB_LIBS@ \ +@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_mouse_SOURCES = probe-mouse.c + hald_probe_mouse_CPPFLAGS = $(AM_CPPFLAGS) @GLIB_CFLAGS@ + hald_probe_mouse_LDADD = \ +@@ -363,14 +358,14 @@ $(srcdir)/Makefile.in: @MAINTAINER_MODE_ + @for dep in $?; do \ + case '$(am__configure_deps)' in \ + *$$dep*) \ +- ( cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ) \ +- && { if test -f $@; then exit 0; else break; fi; }; \ ++ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \ ++ && exit 0; \ + exit 1;; \ + esac; \ + done; \ +- echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu hald/freebsd/probing/Makefile'; \ +- $(am__cd) $(top_srcdir) && \ +- $(AUTOMAKE) --gnu hald/freebsd/probing/Makefile ++ echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu hald/freebsd/probing/Makefile'; \ ++ cd $(top_srcdir) && \ ++ $(AUTOMAKE) --gnu hald/freebsd/probing/Makefile + .PRECIOUS: Makefile + Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status + @case '$?' in \ +@@ -388,74 +383,61 @@ $(top_srcdir)/configure: @MAINTAINER_MOD + cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh + $(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps) + cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh +-$(am__aclocal_m4_deps): + install-libexecPROGRAMS: $(libexec_PROGRAMS) + @$(NORMAL_INSTALL) + test -z "$(libexecdir)" || $(MKDIR_P) "$(DESTDIR)$(libexecdir)" +- @list='$(libexec_PROGRAMS)'; test -n "$(libexecdir)" || list=; \ +- for p in $$list; do echo "$$p $$p"; done | \ +- sed 's/$(EXEEXT)$$//' | \ +- while read p p1; do if test -f $$p || test -f $$p1; \ +- then echo "$$p"; echo "$$p"; else :; fi; \ +- done | \ +- sed -e 'p;s,.*/,,;n;h' -e 's|.*|.|' \ +- -e 'p;x;s,.*/,,;s/$(EXEEXT)$$//;$(transform);s/$$/$(EXEEXT)/' | \ +- sed 'N;N;N;s,\n, ,g' | \ +- $(AWK) 'BEGIN { files["."] = ""; dirs["."] = 1 } \ +- { d=$$3; if (dirs[d] != 1) { print "d", d; dirs[d] = 1 } \ +- if ($$2 == $$4) files[d] = files[d] " " $$1; \ +- else { print "f", $$3 "/" $$4, $$1; } } \ +- END { for (d in files) print "f", d, files[d] }' | \ +- while read type dir files; do \ +- if test "$$dir" = .; then dir=; else dir=/$$dir; fi; \ +- test -z "$$files" || { \ +- echo " $(INSTALL_PROGRAM_ENV) $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(INSTALL_PROGRAM) $$files '$(DESTDIR)$(libexecdir)$$dir'"; \ +- $(INSTALL_PROGRAM_ENV) $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(INSTALL_PROGRAM) $$files "$(DESTDIR)$(libexecdir)$$dir" || exit $$?; \ +- } \ +- ; done ++ @list='$(libexec_PROGRAMS)'; for p in $$list; do \ ++ p1=`echo $$p|sed 's/$(EXEEXT)$$//'`; \ ++ if test -f $$p \ ++ || test -f $$p1 \ ++ ; then \ ++ f=`echo "$$p1" | sed 's,^.*/,,;$(transform);s/$$/$(EXEEXT)/'`; \ ++ echo " $(INSTALL_PROGRAM_ENV) $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(libexecPROGRAMS_INSTALL) '$$p' '$(DESTDIR)$(libexecdir)/$$f'"; \ ++ $(INSTALL_PROGRAM_ENV) $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(libexecPROGRAMS_INSTALL) "$$p" "$(DESTDIR)$(libexecdir)/$$f" || exit 1; \ ++ else :; fi; \ ++ done + + uninstall-libexecPROGRAMS: + @$(NORMAL_UNINSTALL) +- @list='$(libexec_PROGRAMS)'; test -n "$(libexecdir)" || list=; \ +- files=`for p in $$list; do echo "$$p"; done | \ +- sed -e 'h;s,^.*/,,;s/$(EXEEXT)$$//;$(transform)' \ +- -e 's/$$/$(EXEEXT)/' `; \ +- test -n "$$list" || exit 0; \ +- echo " ( cd '$(DESTDIR)$(libexecdir)' && rm -f" $$files ")"; \ +- cd "$(DESTDIR)$(libexecdir)" && rm -f $$files ++ @list='$(libexec_PROGRAMS)'; for p in $$list; do \ ++ f=`echo "$$p" | sed 's,^.*/,,;s/$(EXEEXT)$$//;$(transform);s/$$/$(EXEEXT)/'`; \ ++ echo " rm -f '$(DESTDIR)$(libexecdir)/$$f'"; \ ++ rm -f "$(DESTDIR)$(libexecdir)/$$f"; \ ++ done + + clean-libexecPROGRAMS: +- @list='$(libexec_PROGRAMS)'; test -n "$$list" || exit 0; \ +- echo " rm -f" $$list; \ +- rm -f $$list || exit $$?; \ +- test -n "$(EXEEXT)" || exit 0; \ +- list=`for p in $$list; do echo "$$p"; done | sed 's/$(EXEEXT)$$//'`; \ +- echo " rm -f" $$list; \ +- rm -f $$list ++ @list='$(libexec_PROGRAMS)'; for p in $$list; do \ ++ f=`echo $$p|sed 's/$(EXEEXT)$$//'`; \ ++ echo " rm -f $$p $$f"; \ ++ rm -f $$p $$f ; \ ++ done 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) +- $(AM_V_CCLD)$(LINK) $(hald_probe_hiddev_OBJECTS) $(hald_probe_hiddev_LDADD) $(LIBS) ++ $(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) +- $(AM_V_CCLD)$(LINK) $(hald_probe_mouse_OBJECTS) $(hald_probe_mouse_LDADD) $(LIBS) + $(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 +- $(AM_V_CCLD)$(LINK) $(hald_probe_scsi_OBJECTS) $(hald_probe_scsi_LDADD) $(LIBS) ++ $(LINK) $(hald_probe_scsi_OBJECTS) $(hald_probe_scsi_LDADD) $(LIBS) + hald-probe-smbios$(EXEEXT): $(hald_probe_smbios_OBJECTS) $(hald_probe_smbios_DEPENDENCIES) + @rm -f hald-probe-smbios$(EXEEXT) +- $(AM_V_CCLD)$(LINK) $(hald_probe_smbios_OBJECTS) $(hald_probe_smbios_LDADD) $(LIBS) ++ $(LINK) $(hald_probe_smbios_OBJECTS) $(hald_probe_smbios_LDADD) $(LIBS) 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) +- $(AM_V_CCLD)$(LINK) $(hald_probe_storage_OBJECTS) $(hald_probe_storage_LDADD) $(LIBS) ++ $(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) +- $(AM_V_CCLD)$(LINK) $(hald_probe_usb2_device_OBJECTS) $(hald_probe_usb2_device_LDADD) $(LIBS) + $(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) + hald-probe-usb2-interface$(EXEEXT): $(hald_probe_usb2_interface_OBJECTS) $(hald_probe_usb2_interface_DEPENDENCIES) + @rm -f hald-probe-usb2-interface$(EXEEXT) +- $(AM_V_CCLD)$(LINK) $(hald_probe_usb2_interface_OBJECTS) $(hald_probe_usb2_interface_LDADD) $(LIBS) + $(LINK) $(hald_probe_usb2_interface_OBJECTS) $(hald_probe_usb2_interface_LDADD) $(LIBS) ++hald-probe-video4linux$(EXEEXT): $(hald_probe_video4linux_OBJECTS) $(hald_probe_video4linux_DEPENDENCIES) ++ @rm -f hald-probe-video4linux$(EXEEXT) ++ $(LINK) $(hald_probe_video4linux_OBJECTS) $(hald_probe_video4linux_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 +- $(AM_V_CCLD)$(LINK) $(hald_probe_volume_OBJECTS) $(hald_probe_volume_LDADD) $(LIBS) ++ $(LINK) $(hald_probe_volume_OBJECTS) $(hald_probe_volume_LDADD) $(LIBS) -+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/hald_probe_mouse-probe-mouse.Po@am__quote@ + mostlyclean-compile: + -rm -f *.$(OBJEXT) +@@ -466,6 +448,7 @@ distclean-compile: + @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_video4linux-probe-video4linux.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)/hald_probe_volume-probe-volume.Po@am__quote@ @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@ +@@ -475,105 +458,106 @@ distclean-compile: + @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: +-@am__fastdepCC_TRUE@ $(AM_V_CC)$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $< +-@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po +-@am__fastdepCC_FALSE@ $(AM_V_CC) @AM_BACKSLASH@ ++@am__fastdepCC_TRUE@ $(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $< ++@am__fastdepCC_TRUE@ mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po + @AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ + @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ + @am__fastdepCC_FALSE@ $(COMPILE) -c $< + + .c.obj: +-@am__fastdepCC_TRUE@ $(AM_V_CC)$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'` +-@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po +-@am__fastdepCC_FALSE@ $(AM_V_CC) @AM_BACKSLASH@ ++@am__fastdepCC_TRUE@ $(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'` ++@am__fastdepCC_TRUE@ mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po + @AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ + @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ + @am__fastdepCC_FALSE@ $(COMPILE) -c `$(CYGPATH_W) '$<'` + + .c.lo: +-@am__fastdepCC_TRUE@ $(AM_V_CC)$(LTCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $< +-@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Plo +-@am__fastdepCC_FALSE@ $(AM_V_CC) @AM_BACKSLASH@ ++@am__fastdepCC_TRUE@ $(LTCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $< ++@am__fastdepCC_TRUE@ mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Plo + @AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@ @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 + hald_probe_mouse-probe-mouse.o: probe-mouse.c +-@am__fastdepCC_TRUE@ $(AM_V_CC)$(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@ $(AM_V_at)$(am__mv) $(DEPDIR)/hald_probe_mouse-probe-mouse.Tpo $(DEPDIR)/hald_probe_mouse-probe-mouse.Po +-@am__fastdepCC_FALSE@ $(AM_V_CC) @AM_BACKSLASH@ +@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 + @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@ $(AM_V_CC)$(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@ $(AM_V_at)$(am__mv) $(DEPDIR)/hald_probe_mouse-probe-mouse.Tpo $(DEPDIR)/hald_probe_mouse-probe-mouse.Po +-@am__fastdepCC_FALSE@ $(AM_V_CC) @AM_BACKSLASH@ +@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@ 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@ $(AM_V_CC)$(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@ $(AM_V_at)$(am__mv) $(DEPDIR)/hald_probe_storage-freebsd_dvd_rw_utils.Tpo $(DEPDIR)/hald_probe_storage-freebsd_dvd_rw_utils.Po +-@am__fastdepCC_FALSE@ $(AM_V_CC) @AM_BACKSLASH@ ++@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 + @AMDEP_TRUE@@am__fastdepCC_FALSE@ source='freebsd_dvd_rw_utils.c' object='hald_probe_storage-freebsd_dvd_rw_utils.o' libtool=no @AMDEPBACKSLASH@ + @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ + @am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(hald_probe_storage_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o hald_probe_storage-freebsd_dvd_rw_utils.o `test -f 'freebsd_dvd_rw_utils.c' || echo '$(srcdir)/'`freebsd_dvd_rw_utils.c + + hald_probe_storage-freebsd_dvd_rw_utils.obj: freebsd_dvd_rw_utils.c +-@am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(hald_probe_storage_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT hald_probe_storage-freebsd_dvd_rw_utils.obj -MD -MP -MF $(DEPDIR)/hald_probe_storage-freebsd_dvd_rw_utils.Tpo -c -o hald_probe_storage-freebsd_dvd_rw_utils.obj `if test -f 'freebsd_dvd_rw_utils.c'; then $(CYGPATH_W) 'freebsd_dvd_rw_utils.c'; else $(CYGPATH_W) '$(srcdir)/freebsd_dvd_rw_utils.c'; fi` +-@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/hald_probe_storage-freebsd_dvd_rw_utils.Tpo $(DEPDIR)/hald_probe_storage-freebsd_dvd_rw_utils.Po +-@am__fastdepCC_FALSE@ $(AM_V_CC) @AM_BACKSLASH@ ++@am__fastdepCC_TRUE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(hald_probe_storage_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT hald_probe_storage-freebsd_dvd_rw_utils.obj -MD -MP -MF $(DEPDIR)/hald_probe_storage-freebsd_dvd_rw_utils.Tpo -c -o hald_probe_storage-freebsd_dvd_rw_utils.obj `if test -f 'freebsd_dvd_rw_utils.c'; then $(CYGPATH_W) 'freebsd_dvd_rw_utils.c'; else $(CYGPATH_W) '$(srcdir)/freebsd_dvd_rw_utils.c'; fi` ++@am__fastdepCC_TRUE@ mv -f $(DEPDIR)/hald_probe_storage-freebsd_dvd_rw_utils.Tpo $(DEPDIR)/hald_probe_storage-freebsd_dvd_rw_utils.Po + @AMDEP_TRUE@@am__fastdepCC_FALSE@ source='freebsd_dvd_rw_utils.c' object='hald_probe_storage-freebsd_dvd_rw_utils.obj' libtool=no @AMDEPBACKSLASH@ + @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ + @am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(hald_probe_storage_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o hald_probe_storage-freebsd_dvd_rw_utils.obj `if test -f 'freebsd_dvd_rw_utils.c'; then $(CYGPATH_W) 'freebsd_dvd_rw_utils.c'; else $(CYGPATH_W) '$(srcdir)/freebsd_dvd_rw_utils.c'; fi` + + hald_probe_storage-probe-storage.o: probe-storage.c +-@am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(hald_probe_storage_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT hald_probe_storage-probe-storage.o -MD -MP -MF $(DEPDIR)/hald_probe_storage-probe-storage.Tpo -c -o hald_probe_storage-probe-storage.o `test -f 'probe-storage.c' || echo '$(srcdir)/'`probe-storage.c +-@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/hald_probe_storage-probe-storage.Tpo $(DEPDIR)/hald_probe_storage-probe-storage.Po +-@am__fastdepCC_FALSE@ $(AM_V_CC) @AM_BACKSLASH@ ++@am__fastdepCC_TRUE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(hald_probe_storage_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT hald_probe_storage-probe-storage.o -MD -MP -MF $(DEPDIR)/hald_probe_storage-probe-storage.Tpo -c -o hald_probe_storage-probe-storage.o `test -f 'probe-storage.c' || echo '$(srcdir)/'`probe-storage.c ++@am__fastdepCC_TRUE@ mv -f $(DEPDIR)/hald_probe_storage-probe-storage.Tpo $(DEPDIR)/hald_probe_storage-probe-storage.Po + @AMDEP_TRUE@@am__fastdepCC_FALSE@ source='probe-storage.c' object='hald_probe_storage-probe-storage.o' libtool=no @AMDEPBACKSLASH@ + @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ + @am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(hald_probe_storage_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o hald_probe_storage-probe-storage.o `test -f 'probe-storage.c' || echo '$(srcdir)/'`probe-storage.c + + hald_probe_storage-probe-storage.obj: probe-storage.c +-@am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(hald_probe_storage_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT hald_probe_storage-probe-storage.obj -MD -MP -MF $(DEPDIR)/hald_probe_storage-probe-storage.Tpo -c -o hald_probe_storage-probe-storage.obj `if test -f 'probe-storage.c'; then $(CYGPATH_W) 'probe-storage.c'; else $(CYGPATH_W) '$(srcdir)/probe-storage.c'; fi` +-@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/hald_probe_storage-probe-storage.Tpo $(DEPDIR)/hald_probe_storage-probe-storage.Po +-@am__fastdepCC_FALSE@ $(AM_V_CC) @AM_BACKSLASH@ ++@am__fastdepCC_TRUE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(hald_probe_storage_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT hald_probe_storage-probe-storage.obj -MD -MP -MF $(DEPDIR)/hald_probe_storage-probe-storage.Tpo -c -o hald_probe_storage-probe-storage.obj `if test -f 'probe-storage.c'; then $(CYGPATH_W) 'probe-storage.c'; else $(CYGPATH_W) '$(srcdir)/probe-storage.c'; fi` ++@am__fastdepCC_TRUE@ mv -f $(DEPDIR)/hald_probe_storage-probe-storage.Tpo $(DEPDIR)/hald_probe_storage-probe-storage.Po + @AMDEP_TRUE@@am__fastdepCC_FALSE@ source='probe-storage.c' object='hald_probe_storage-probe-storage.obj' libtool=no @AMDEPBACKSLASH@ + @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ + @am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(hald_probe_storage_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o hald_probe_storage-probe-storage.obj `if test -f 'probe-storage.c'; then $(CYGPATH_W) 'probe-storage.c'; else $(CYGPATH_W) '$(srcdir)/probe-storage.c'; fi` + ++hald_probe_video4linux-probe-video4linux.o: probe-video4linux.c ++@am__fastdepCC_TRUE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(hald_probe_video4linux_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT hald_probe_video4linux-probe-video4linux.o -MD -MP -MF $(DEPDIR)/hald_probe_video4linux-probe-video4linux.Tpo -c -o hald_probe_video4linux-probe-video4linux.o `test -f 'probe-video4linux.c' || echo '$(srcdir)/'`probe-video4linux.c ++@am__fastdepCC_TRUE@ mv -f $(DEPDIR)/hald_probe_video4linux-probe-video4linux.Tpo $(DEPDIR)/hald_probe_video4linux-probe-video4linux.Po ++@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='probe-video4linux.c' object='hald_probe_video4linux-probe-video4linux.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.obj `if test -f 'probe-mouse.c'; then $(CYGPATH_W) 'probe-mouse.c'; else $(CYGPATH_W) '$(srcdir)/probe-mouse.c'; fi` ++@am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(hald_probe_video4linux_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o hald_probe_video4linux-probe-video4linux.o `test -f 'probe-video4linux.c' || echo '$(srcdir)/'`probe-video4linux.c + - 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 ++hald_probe_video4linux-probe-video4linux.obj: probe-video4linux.c ++@am__fastdepCC_TRUE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(hald_probe_video4linux_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT hald_probe_video4linux-probe-video4linux.obj -MD -MP -MF $(DEPDIR)/hald_probe_video4linux-probe-video4linux.Tpo -c -o hald_probe_video4linux-probe-video4linux.obj `if test -f 'probe-video4linux.c'; then $(CYGPATH_W) 'probe-video4linux.c'; else $(CYGPATH_W) '$(srcdir)/probe-video4linux.c'; fi` ++@am__fastdepCC_TRUE@ mv -f $(DEPDIR)/hald_probe_video4linux-probe-video4linux.Tpo $(DEPDIR)/hald_probe_video4linux-probe-video4linux.Po ++@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='probe-video4linux.c' object='hald_probe_video4linux-probe-video4linux.obj' libtool=no @AMDEPBACKSLASH@ ++@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ ++@am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(hald_probe_video4linux_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o hald_probe_video4linux-probe-video4linux.obj `if test -f 'probe-video4linux.c'; then $(CYGPATH_W) 'probe-video4linux.c'; else $(CYGPATH_W) '$(srcdir)/probe-video4linux.c'; fi` ++ + hald_probe_volume-freebsd_dvd_rw_utils.o: freebsd_dvd_rw_utils.c +-@am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(hald_probe_volume_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT hald_probe_volume-freebsd_dvd_rw_utils.o -MD -MP -MF $(DEPDIR)/hald_probe_volume-freebsd_dvd_rw_utils.Tpo -c -o hald_probe_volume-freebsd_dvd_rw_utils.o `test -f 'freebsd_dvd_rw_utils.c' || echo '$(srcdir)/'`freebsd_dvd_rw_utils.c +-@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/hald_probe_volume-freebsd_dvd_rw_utils.Tpo $(DEPDIR)/hald_probe_volume-freebsd_dvd_rw_utils.Po +-@am__fastdepCC_FALSE@ $(AM_V_CC) @AM_BACKSLASH@ ++@am__fastdepCC_TRUE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(hald_probe_volume_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT hald_probe_volume-freebsd_dvd_rw_utils.o -MD -MP -MF $(DEPDIR)/hald_probe_volume-freebsd_dvd_rw_utils.Tpo -c -o hald_probe_volume-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_volume-freebsd_dvd_rw_utils.Tpo $(DEPDIR)/hald_probe_volume-freebsd_dvd_rw_utils.Po + @AMDEP_TRUE@@am__fastdepCC_FALSE@ source='freebsd_dvd_rw_utils.c' object='hald_probe_volume-freebsd_dvd_rw_utils.o' libtool=no @AMDEPBACKSLASH@ + @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ + @am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(hald_probe_volume_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o hald_probe_volume-freebsd_dvd_rw_utils.o `test -f 'freebsd_dvd_rw_utils.c' || echo '$(srcdir)/'`freebsd_dvd_rw_utils.c + + hald_probe_volume-freebsd_dvd_rw_utils.obj: freebsd_dvd_rw_utils.c +-@am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(hald_probe_volume_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT hald_probe_volume-freebsd_dvd_rw_utils.obj -MD -MP -MF $(DEPDIR)/hald_probe_volume-freebsd_dvd_rw_utils.Tpo -c -o hald_probe_volume-freebsd_dvd_rw_utils.obj `if test -f 'freebsd_dvd_rw_utils.c'; then $(CYGPATH_W) 'freebsd_dvd_rw_utils.c'; else $(CYGPATH_W) '$(srcdir)/freebsd_dvd_rw_utils.c'; fi` +-@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/hald_probe_volume-freebsd_dvd_rw_utils.Tpo $(DEPDIR)/hald_probe_volume-freebsd_dvd_rw_utils.Po +-@am__fastdepCC_FALSE@ $(AM_V_CC) @AM_BACKSLASH@ ++@am__fastdepCC_TRUE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(hald_probe_volume_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT hald_probe_volume-freebsd_dvd_rw_utils.obj -MD -MP -MF $(DEPDIR)/hald_probe_volume-freebsd_dvd_rw_utils.Tpo -c -o hald_probe_volume-freebsd_dvd_rw_utils.obj `if test -f 'freebsd_dvd_rw_utils.c'; then $(CYGPATH_W) 'freebsd_dvd_rw_utils.c'; else $(CYGPATH_W) '$(srcdir)/freebsd_dvd_rw_utils.c'; fi` ++@am__fastdepCC_TRUE@ mv -f $(DEPDIR)/hald_probe_volume-freebsd_dvd_rw_utils.Tpo $(DEPDIR)/hald_probe_volume-freebsd_dvd_rw_utils.Po + @AMDEP_TRUE@@am__fastdepCC_FALSE@ source='freebsd_dvd_rw_utils.c' object='hald_probe_volume-freebsd_dvd_rw_utils.obj' libtool=no @AMDEPBACKSLASH@ + @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ + @am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(hald_probe_volume_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o hald_probe_volume-freebsd_dvd_rw_utils.obj `if test -f 'freebsd_dvd_rw_utils.c'; then $(CYGPATH_W) 'freebsd_dvd_rw_utils.c'; else $(CYGPATH_W) '$(srcdir)/freebsd_dvd_rw_utils.c'; fi` + + hald_probe_volume-probe-volume.o: probe-volume.c +-@am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(hald_probe_volume_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT hald_probe_volume-probe-volume.o -MD -MP -MF $(DEPDIR)/hald_probe_volume-probe-volume.Tpo -c -o hald_probe_volume-probe-volume.o `test -f 'probe-volume.c' || echo '$(srcdir)/'`probe-volume.c +-@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/hald_probe_volume-probe-volume.Tpo $(DEPDIR)/hald_probe_volume-probe-volume.Po +-@am__fastdepCC_FALSE@ $(AM_V_CC) @AM_BACKSLASH@ ++@am__fastdepCC_TRUE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(hald_probe_volume_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT hald_probe_volume-probe-volume.o -MD -MP -MF $(DEPDIR)/hald_probe_volume-probe-volume.Tpo -c -o hald_probe_volume-probe-volume.o `test -f 'probe-volume.c' || echo '$(srcdir)/'`probe-volume.c ++@am__fastdepCC_TRUE@ mv -f $(DEPDIR)/hald_probe_volume-probe-volume.Tpo $(DEPDIR)/hald_probe_volume-probe-volume.Po + @AMDEP_TRUE@@am__fastdepCC_FALSE@ source='probe-volume.c' object='hald_probe_volume-probe-volume.o' libtool=no @AMDEPBACKSLASH@ + @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ + @am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(hald_probe_volume_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o hald_probe_volume-probe-volume.o `test -f 'probe-volume.c' || echo '$(srcdir)/'`probe-volume.c + + hald_probe_volume-probe-volume.obj: probe-volume.c +-@am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(hald_probe_volume_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT hald_probe_volume-probe-volume.obj -MD -MP -MF $(DEPDIR)/hald_probe_volume-probe-volume.Tpo -c -o hald_probe_volume-probe-volume.obj `if test -f 'probe-volume.c'; then $(CYGPATH_W) 'probe-volume.c'; else $(CYGPATH_W) '$(srcdir)/probe-volume.c'; fi` +-@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/hald_probe_volume-probe-volume.Tpo $(DEPDIR)/hald_probe_volume-probe-volume.Po +-@am__fastdepCC_FALSE@ $(AM_V_CC) @AM_BACKSLASH@ ++@am__fastdepCC_TRUE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(hald_probe_volume_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT hald_probe_volume-probe-volume.obj -MD -MP -MF $(DEPDIR)/hald_probe_volume-probe-volume.Tpo -c -o hald_probe_volume-probe-volume.obj `if test -f 'probe-volume.c'; then $(CYGPATH_W) 'probe-volume.c'; else $(CYGPATH_W) '$(srcdir)/probe-volume.c'; fi` ++@am__fastdepCC_TRUE@ mv -f $(DEPDIR)/hald_probe_volume-probe-volume.Tpo $(DEPDIR)/hald_probe_volume-probe-volume.Po + @AMDEP_TRUE@@am__fastdepCC_FALSE@ source='probe-volume.c' object='hald_probe_volume-probe-volume.obj' libtool=no @AMDEPBACKSLASH@ + @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ + @am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(hald_probe_volume_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o hald_probe_volume-probe-volume.obj `if test -f 'probe-volume.c'; then $(CYGPATH_W) 'probe-volume.c'; else $(CYGPATH_W) '$(srcdir)/probe-volume.c'; fi` +@@ -589,14 +573,14 @@ ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS + unique=`for i in $$list; do \ + if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ + done | \ +- $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ ++ $(AWK) '{ files[$$0] = 1; nonemtpy = 1; } \ + END { if (nonempty) { for (i in files) print i; }; }'`; \ + mkid -fID $$unique + tags: TAGS + + TAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ + $(TAGS_FILES) $(LISP) +- set x; \ ++ tags=; \ + here=`pwd`; \ + list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ + unique=`for i in $$list; do \ +@@ -604,34 +588,29 @@ TAGS: $(HEADERS) $(SOURCES) $(TAGS_DEP + done | \ + $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ + END { if (nonempty) { for (i in files) print i; }; }'`; \ +- shift; \ +- if test -z "$(ETAGS_ARGS)$$*$$unique"; then :; else \ ++ if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \ + test -n "$$unique" || unique=$$empty_fix; \ +- if test $$# -gt 0; then \ +- $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \ +- "$$@" $$unique; \ +- else \ +- $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \ +- $$unique; \ +- fi; \ ++ $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \ ++ $$tags $$unique; \ + fi + ctags: CTAGS + CTAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ + $(TAGS_FILES) $(LISP) ++ tags=; \ + list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ + unique=`for i in $$list; do \ + if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ + done | \ + $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ + END { if (nonempty) { for (i in files) print i; }; }'`; \ +- test -z "$(CTAGS_ARGS)$$unique" \ ++ test -z "$(CTAGS_ARGS)$$tags$$unique" \ + || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \ +- $$unique ++ $$tags $$unique + + GTAGS: + here=`$(am__cd) $(top_builddir) && pwd` \ +- && $(am__cd) $(top_srcdir) \ +- && gtags -i $(GTAGS_ARGS) "$$here" ++ && cd $(top_srcdir) \ ++ && gtags -i $(GTAGS_ARGS) $$here + + distclean-tags: + -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags +@@ -652,17 +631,13 @@ distdir: $(DISTFILES) + if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \ + if test -d $$d/$$file; then \ + dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \ +- if test -d "$(distdir)/$$file"; then \ +- find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \ +- fi; \ + if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \ +- cp -fpR $(srcdir)/$$file "$(distdir)$$dir" || exit 1; \ +- find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \ ++ cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \ + fi; \ +- cp -fpR $$d/$$file "$(distdir)$$dir" || exit 1; \ ++ cp -pR $$d/$$file $(distdir)$$dir || exit 1; \ + else \ +- test -f "$(distdir)/$$file" \ +- || cp -p $$d/$$file "$(distdir)/$$file" \ ++ test -f $(distdir)/$$file \ ++ || cp -p $$d/$$file $(distdir)/$$file \ + || exit 1; \ + fi; \ + done +@@ -693,7 +668,6 @@ clean-generic: + + distclean-generic: + -test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES) +- -test . = "$(srcdir)" || test -z "$(CONFIG_CLEAN_VPATH_FILES)" || rm -f $(CONFIG_CLEAN_VPATH_FILES) + + maintainer-clean-generic: + @echo "This command is intended for maintainers to use" +@@ -715,8 +689,6 @@ dvi-am: + + html: html-am + +-html-am: +- + info: info-am + + info-am: +@@ -725,28 +697,18 @@ install-data-am: + + install-dvi: install-dvi-am + +-install-dvi-am: +- + install-exec-am: install-libexecPROGRAMS + + install-html: install-html-am + +-install-html-am: +- + install-info: install-info-am + +-install-info-am: +- + install-man: + + install-pdf: install-pdf-am + +-install-pdf-am: +- + install-ps: install-ps-am + +-install-ps-am: +- + installcheck-am: + + maintainer-clean: maintainer-clean-am +@@ -785,7 +747,6 @@ uninstall-am: uninstall-libexecPROGRAMS + mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \ + tags uninstall uninstall-am uninstall-libexecPROGRAMS + +- + # Tell versions [3.59,3.63) of GNU make to not export all variables. + # Otherwise a system limit (for SysV at least) may be exceeded. + .NOEXPORT: 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 ee627c451795..000000000000 --- 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 901da9333dc1..000000000000 --- 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$ -+ * -+ * 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 d67ce03bff30..000000000000 --- 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 5cae11b6b9b8..000000000000 --- 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$ -+ * -+ * 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 index beb646134bcb..fa04e0fa096d 100644 --- a/sysutils/hal/files/patch-hald_freebsd_probing_probe-usb2-interface.c +++ b/sysutils/hal/files/patch-hald_freebsd_probing_probe-usb2-interface.c @@ -1,143 +1,16 @@ ---- hald/freebsd/probing/probe-usb2-interface.c.orig 2010-01-23 19:24:29.000000000 -0500 -+++ hald/freebsd/probing/probe-usb2-interface.c 2010-01-23 19:52:30.000000000 -0500 -@@ -0,0 +1,140 @@ -+/*************************************************************************** -+ * CVSID: $Id$ -+ * -+ * 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; -+ +--- hald/freebsd/probing/probe-usb2-interface.c.orig 2010-01-23 22:01:20.000000000 -0500 ++++ hald/freebsd/probing/probe-usb2-interface.c 2010-01-23 22:01:49.000000000 -0500 +@@ -58,11 +58,11 @@ main(int argc, char **argv) + if (pbe == NULL) + goto end; + +- busstr = getenv("HAL_PROP_USB_DEVICE_BUS_NUMBER"); + busstr = getenv("HAL_PROP_USB_BUS_NUMBER"); -+ if (! busstr) -+ goto end; -+ + if (! busstr) + goto end; + +- addrstr = getenv("HAL_PROP_USB_DEVICE_PORT_NUMBER"); + addrstr = getenv("HAL_PROP_USB_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; -+} + if (! addrstr) + goto end; + diff --git a/sysutils/hal/files/patch-hald_freebsd_probing_probe-video4linux.c b/sysutils/hal/files/patch-hald_freebsd_probing_probe-video4linux.c new file mode 100644 index 000000000000..aaac7261bb4b --- /dev/null +++ b/sysutils/hal/files/patch-hald_freebsd_probing_probe-video4linux.c @@ -0,0 +1,228 @@ +--- hald/freebsd/probing/probe-video4linux.c.orig 2010-02-21 14:51:01.000000000 -0500 ++++ hald/freebsd/probing/probe-video4linux.c 2010-02-21 14:54:51.000000000 -0500 +@@ -0,0 +1,225 @@ ++/*************************************************************************** ++ * CVSID: $Id$ ++ * ++ * probe-video4linux.c : Probe video4linux devices ++ * Adapted for FreeBSD by : Joe Marcus Clarke <marcus@FreeBSD.org> ++ * ++ * Copyright (C) 2007 Nokia Corporation ++ * ++ * Licensed under the Academic Free License version 2.1 ++ * ++ * 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/types.h> ++#include <sys/user.h> ++#include <sys/sysctl.h> ++#include <sys/time.h> ++#include <sys/ioctl.h> ++#include <linux/videodev.h> ++#include <linux/videodev2.h> ++#include <errno.h> ++#include <fcntl.h> ++#include <stdint.h> ++#include <stdio.h> ++#include <stdlib.h> ++#include <string.h> ++#include <unistd.h> ++#include <glib.h> ++ ++#include "../libprobe/hfp.h" ++ ++#define WEBCAMD_PID_FILE "/var/run/webcamd" ++#define V4B_DEVICES_MAX 10 /* XXX from video4bsd.h */ ++ ++static int ++hfp_v4l_get_unit (int bus, int addr) ++{ ++ int i; ++ pid_t pid; ++ int mib[4]; ++ char *endptr; ++ char *pidf = NULL; ++ char *contents = NULL; ++ gsize len; ++ ++ for (i = 0; i < V4B_DEVICES_MAX; i++) { ++ pidf = g_strdup_printf ("%s.%i.%i.%i.pid", WEBCAMD_PID_FILE, bus, addr, i); ++ if (g_file_test (pidf, G_FILE_TEST_EXISTS)) ++ break; ++ g_free (pidf); ++ pidf = NULL; ++ } ++ ++ if (pidf == NULL) ++ return -1; ++ ++ if (! g_file_get_contents (pidf, &contents, &len, NULL)) { ++ g_free (pidf); ++ return -1; ++ } ++ ++ g_free (pidf); ++ ++ pid = (int) strtol (contents, &endptr, 10); ++ if (endptr == contents) { ++ g_free (contents); ++ return -1; ++ } ++ g_free (contents); ++ ++ len = 4; ++ sysctlnametomib ("kern.proc.pid", mib, &len); ++ ++ len = sizeof(struct kinfo_proc); ++ mib[3] = pid; ++ ++ /* This is just a rough test. */ ++ if (sysctl (mib, 4, NULL, &len, NULL, 0) == -1) ++ return -1; ++ ++ return i; ++} ++ ++int ++main (int argc, char **argv) ++{ ++ int ret = 1; ++ int fd = -1; ++ int unit = -1; ++ int bus = -1; ++ int addr = -1; ++ int intf = -1; ++ char *device_file = NULL; ++ char *busstr; ++ char *addrstr; ++ char *intfstr; ++ struct video_capability v1cap; ++ struct v4l2_capability v2cap; ++ LibHalChangeSet *cset; ++ ++ if (! hfp_init (argc, argv)) ++ goto out; ++ ++ busstr = getenv ("HAL_PROP_USB_BUS_NUMBER"); ++ if (! busstr) ++ goto out; ++ addrstr = getenv ("HAL_PROP_USB_PORT_NUMBER"); ++ if (! addrstr) ++ goto out; ++ intfstr = getenv ("HAL_PROP_USB_INTERFACE_NUMBER"); ++ if (! intfstr) ++ goto out; ++ ++ bus = atoi (busstr); ++ addr = atoi (addrstr); ++ intf = atoi (intfstr); ++ if (intf != 0) ++ goto out; ++ ++ unit = hfp_v4l_get_unit (bus, addr); ++ if (unit == -1) ++ goto out; ++ device_file = g_strdup_printf ("/dev/video%i", unit); ++ if (device_file == NULL) ++ goto out; ++ ++ /* give a meaningful process title for ps(1) */ ++ setproctitle("%s (bus: %i, addr: %i)", device_file, bus, addr); ++ ++ cset = libhal_device_new_changeset (hfp_udi); ++ ++ hfp_info ("Doing probe-video4linux for %s (udi=%s)", device_file, hfp_udi); ++ ++ fd = open (device_file, O_RDONLY); ++ if (fd < 0) { ++ hfp_critical ("Cannot open %s: %s", device_file, strerror (errno)); ++ goto out; ++ } ++ ++ if (ioctl (fd, VIDIOC_QUERYCAP, &v2cap) == 0) { ++ libhal_changeset_set_property_string (cset, ++ "video4linux.device", device_file); ++ libhal_changeset_set_property_string (cset, ++ "info.category", "video4linux"); ++ libhal_changeset_set_property_string (cset, ++ "video4linux.version", "2"); ++ ++ libhal_changeset_set_property_string (cset, ++ "info.product", (const char *)v2cap.card); ++ ++ libhal_device_add_capability (hfp_ctx, hfp_udi, "video4linux", NULL); ++ if ((v2cap.capabilities & V4L2_CAP_VIDEO_CAPTURE) > 0) { ++ libhal_device_add_capability (hfp_ctx, hfp_udi, "video4linux.video_capture", NULL); ++ } if ((v2cap.capabilities & V4L2_CAP_VIDEO_OUTPUT) > 0) { ++ libhal_device_add_capability (hfp_ctx, hfp_udi, "video4linux.video_output", NULL); ++ } if ((v2cap.capabilities & V4L2_CAP_VIDEO_OVERLAY) > 0) { ++ libhal_device_add_capability (hfp_ctx, hfp_udi, "video4linux.video_overlay", NULL); ++ } if ((v2cap.capabilities & V4L2_CAP_AUDIO) > 0) { ++ libhal_device_add_capability (hfp_ctx, hfp_udi, "video4linux.audio", NULL); ++ } if ((v2cap.capabilities & V4L2_CAP_TUNER) > 0) { ++ libhal_device_add_capability (hfp_ctx, hfp_udi, "video4linux.tuner", NULL); ++ } if ((v2cap.capabilities & V4L2_CAP_RADIO) > 0) { ++ libhal_device_add_capability (hfp_ctx, hfp_udi, "video4linux.radio", NULL); ++ } ++ } else { ++ hfp_info (("ioctl VIDIOC_QUERYCAP failed")); ++ ++ if (ioctl (fd, VIDIOCGCAP, &v1cap) == 0) { ++ libhal_changeset_set_property_string (cset, ++ "video4linux.device", device_file); ++ libhal_changeset_set_property_string (cset, ++ "info.category", "video4linux"); ++ libhal_changeset_set_property_string (cset, ++ "video4linux.version", "1"); ++ ++ libhal_changeset_set_property_string (cset, ++ "info.product", v1cap.name); ++ ++ libhal_device_add_capability (hfp_ctx, hfp_udi, "video4linux", NULL); ++ if ((v1cap.type & VID_TYPE_CAPTURE) > 0) { ++ libhal_device_add_capability (hfp_ctx, hfp_udi, "video4linux.video_capture", NULL); ++ } if ((v1cap.type & VID_TYPE_OVERLAY) > 0) { ++ libhal_device_add_capability (hfp_ctx, hfp_udi, "video4linux.video_overlay", NULL); ++ } if (v1cap.audios > 0) { ++ libhal_device_add_capability (hfp_ctx, hfp_udi, "video4linux.audio", NULL); ++ } if ((v1cap.type & VID_TYPE_TUNER) > 0) { ++ libhal_device_add_capability (hfp_ctx, hfp_udi, "video4linux.tuner", NULL); ++ } ++ } else { ++ hfp_info (("ioctl VIDIOCGCAP failed; not a v4l device")); ++ } ++ } ++ ++ libhal_device_commit_changeset (hfp_ctx, cset, NULL); ++ libhal_device_free_changeset (cset); ++ ++ close (fd); ++ ++ ret = 0; ++ ++out: ++ g_free (device_file); ++ if (fd >= 0) ++ close (fd); ++ ++ return ret; ++} ++ diff --git a/sysutils/hal/files/patch-hald_freebsd_probing_probe-volume.c b/sysutils/hal/files/patch-hald_freebsd_probing_probe-volume.c index c92b7026654d..1ff3d020642a 100644 --- a/sysutils/hal/files/patch-hald_freebsd_probing_probe-volume.c +++ b/sysutils/hal/files/patch-hald_freebsd_probing_probe-volume.c @@ -1,74 +1,31 @@ ---- 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); - } +--- hald/freebsd/probing/probe-volume.c.orig 2009-12-23 14:06:53.000000000 -0500 ++++ hald/freebsd/probing/probe-volume.c 2009-12-23 14:07:01.000000000 -0500 +@@ -574,6 +574,7 @@ main (int argc, char **argv) -- 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); + 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++) -+ { + ufs_devs = libhal_manager_find_device_string_match(hfp_ctx, + "volume.freebsd.ufsid", + ufsid, +@@ -582,16 +583,17 @@ main (int argc, char **argv) + dbus_error_free(&hfp_error); + for (i = 0; i < num_udis; i++) + { +- if (ufs_devs[i] != NULL) + 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); + { + gboolean mounted; + + mounted = libhal_device_get_property_bool(hfp_ctx, ufs_devs[i], "volume.is_mounted", &hfp_error); +- dbus_error_free(&hfp_error); + dbus_error_free(&hfp_error); -+ if (mounted) + if (mounted) +- { + { -+ libhal_device_set_property_bool(hfp_ctx, hfp_udi, "volume.ignore", TRUE, &hfp_error); -+ dbus_error_free(&hfp_error); + 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 index a699ca827e57..162079ac7086 100644 --- a/sysutils/hal/files/patch-hald_hf-storage.c +++ b/sysutils/hal/files/patch-hald_hf-storage.c @@ -1,86 +1,27 @@ ---- 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 @@ +--- hald/freebsd/hf-storage.c.orig 2009-08-24 08:42:29.000000000 -0400 ++++ hald/freebsd/hf-storage.c 2010-02-26 08:29:38.000000000 -0500 +@@ -30,6 +30,7 @@ #include <limits.h> #include <inttypes.h> #include <string.h> +#include <unistd.h> -+#include <sys/param.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; +@@ -418,10 +419,41 @@ 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/"))) ++ ! strcmp(fields[1], "BSD") || ++ ! strcmp(fields[1], "PART")) && ++ ! (strncmp(fields[2], "ufsid/", strlen("ufsid/")) || ++ ! strncmp(fields[2], "ufs/", strlen("ufs/")))) + { + g_strfreev(fields); + continue; @@ -88,7 +29,6 @@ + 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. */ @@ -108,172 +48,32 @@ + } + 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; +@@ -589,11 +621,16 @@ hf_storage_devd_notify (const char *syst char *conftxt; GSList *new_disks; -- if (hf_is_waiting) -- return TRUE; +- if (strcmp(system, "DEVFS") || strcmp(subsystem, "CDEV") || + if (! data || strcmp(system, "DEVFS") || strcmp(subsystem, "CDEV") || -+ (strcmp(type, "CREATE") && strcmp(type, "DESTROY"))) -+ return FALSE; -+ + (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; +@@ -669,7 +706,7 @@ hf_storage_conftxt_timeout_cb (gpointer + if (hf_is_waiting) + return TRUE; -+ 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", NULL); + 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 + return TRUE; } - - 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/pkg-plist b/sysutils/hal/pkg-plist index 0f42ef11f040..33f9be2a2397 100644 --- a/sysutils/hal/pkg-plist +++ b/sysutils/hal/pkg-plist @@ -22,10 +22,6 @@ 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 @@ -70,6 +66,7 @@ libexec/hald-probe-smbios libexec/hald-probe-storage %%USB2%%libexec/hald-probe-usb2-device %%USB2%%libexec/hald-probe-usb2-interface +%%USB2%%libexec/hald-probe-video4linux libexec/hald-probe-volume libexec/hald-runner sbin/hald @@ -130,5 +127,5 @@ share/PolicyKit/policy/org.freedesktop.hal.wol.policy @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 +@unexec rmdir /var/lib/hal 2>/dev/null || true +@unexec rmdir /var/lib 2>/dev/null || true diff --git a/sysutils/pessulus/Makefile b/sysutils/pessulus/Makefile index b0a942137823..d9298e56b62b 100644 --- a/sysutils/pessulus/Makefile +++ b/sysutils/pessulus/Makefile @@ -3,12 +3,11 @@ # Whom: FreeBSD GNOME Team # # $FreeBSD$ -# $MCom: ports/sysutils/pessulus/Makefile,v 1.24 2009/09/23 13:07:48 kwm Exp $ +# $MCom: ports/sysutils/pessulus/Makefile,v 1.28 2010/04/02 04:24:02 avl Exp $ # PORTNAME= pessulus -PORTVERSION= 2.28.0 -PORTREVISION= 2 +PORTVERSION= 2.30.0 CATEGORIES= sysutils gnome MASTER_SITES= GNOME DIST_SUBDIR= gnome2 diff --git a/sysutils/pessulus/distinfo b/sysutils/pessulus/distinfo index 8ab858b7b6b0..4683c78b6953 100644 --- a/sysutils/pessulus/distinfo +++ b/sysutils/pessulus/distinfo @@ -1,3 +1,3 @@ -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 +MD5 (gnome2/pessulus-2.30.0.tar.bz2) = a4a91bd6d554e3a2bb42ce5567d80203 +SHA256 (gnome2/pessulus-2.30.0.tar.bz2) = f735ec84fa179ae7896bcfc100f1ff30c8e135ceee2a8d2f5e7629d3f7454679 +SIZE (gnome2/pessulus-2.30.0.tar.bz2) = 182629 diff --git a/sysutils/pessulus/pkg-plist b/sysutils/pessulus/pkg-plist index f8034c268616..15f1ba1ca103 100644 --- a/sysutils/pessulus/pkg-plist +++ b/sysutils/pessulus/pkg-plist @@ -72,6 +72,7 @@ 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@shaw/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 @@ -124,6 +125,7 @@ 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/uz@cyrillic/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 @@ -136,6 +138,8 @@ share/locale/zh_TW/LC_MESSAGES/pessulus.mo @dirrmtry share/applications @dirrmtry share/locale/zh_HK/LC_MESSAGES @dirrmtry share/locale/zh_HK +@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 @@ -154,14 +158,14 @@ share/locale/zh_TW/LC_MESSAGES/pessulus.mo @dirrmtry share/locale/mai @dirrmtry share/locale/ku/LC_MESSAGES @dirrmtry share/locale/ku +@dirrmtry share/locale/en@shaw/LC_MESSAGES +@dirrmtry share/locale/en@shaw @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 diff --git a/sysutils/polkit-gnome/Makefile b/sysutils/polkit-gnome/Makefile index b964aee0e889..5ccd24b83eaf 100644 --- a/sysutils/polkit-gnome/Makefile +++ b/sysutils/polkit-gnome/Makefile @@ -3,21 +3,19 @@ # Whom: Koop Mast<kwm@FreeBSD.org> # # $FreeBSD$ -# $MCom: ports/sysutils/polkit-gnome/Makefile,v 1.5 2009/11/24 02:22:19 marcus Exp $ +# $MCom: ports/sysutils/polkit-gnome/Makefile,v 1.10 2010/05/10 04:21:19 marcus Exp $ # PORTNAME= polkit-gnome PORTVERSION= 0.96 -PORTREVISION= 2 +PORTREVISION= 3 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 diff --git a/sysutils/polkit-gnome/pkg-plist b/sysutils/polkit-gnome/pkg-plist index df91e2b82fc4..3a4f4dddf06c 100644 --- a/sysutils/polkit-gnome/pkg-plist +++ b/sysutils/polkit-gnome/pkg-plist @@ -41,27 +41,7 @@ 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 +@dirrmtry share/locale/zh_HK/LC_MESSAGES +@dirrmtry share/locale/zh_HK diff --git a/sysutils/sensors-applet/Makefile b/sysutils/sensors-applet/Makefile index f2f2c3aea13d..6f39f031dcd1 100644 --- a/sysutils/sensors-applet/Makefile +++ b/sysutils/sensors-applet/Makefile @@ -7,7 +7,7 @@ PORTNAME= sensors-applet PORTVERSION= 1.6.1 -PORTREVISION= 8 +PORTREVISION= 9 CATEGORIES= sysutils MASTER_SITES= SF/${PORTNAME}/${PORTNAME}/GNOME%20Sensors%20Applet%20Version%20${PORTVERSION} @@ -17,7 +17,7 @@ COMMENT= A GNOME applet displaying hardware sensor values RUN_DEPENDS= mbmon:${PORTSDIR}/sysutils/mbmon \ smartctl:${PORTSDIR}/sysutils/smartmontools -USE_GNOME= gnomehack gnomeprefix intlhack gnomepanel +USE_GNOME= gnomehack gnomeprefix intlhack gnomepanel libgnomeui GNU_CONFIGURE= yes USE_GMAKE= yes DEFINES= -DMBMON_EXECUTABLE=\\\"${LOCALBASE}/bin/mbmon\\\" \ diff --git a/sysutils/system-tools-backends/Makefile b/sysutils/system-tools-backends/Makefile index 2cccf318da19..f250578040f8 100644 --- a/sysutils/system-tools-backends/Makefile +++ b/sysutils/system-tools-backends/Makefile @@ -3,12 +3,11 @@ # Whom: Joe Marcus Clarke <marcus@FreeBSD.org> # # $FreeBSD$ -# $MCom: ports/sysutils/system-tools-backends/Makefile,v 1.54 2009/10/11 19:13:30 marcus Exp $ +# $MCom: ports/sysutils/system-tools-backends/Makefile,v 1.60 2010/04/01 22:21:53 kwm Exp $ # PORTNAME= system-tools-backends -PORTVERSION= 2.8.3 -PORTREVISION= 1 +PORTVERSION= 2.10.0 CATEGORIES= sysutils gnome MASTER_SITES= GNOME DIST_SUBDIR= gnome2 diff --git a/sysutils/system-tools-backends/distinfo b/sysutils/system-tools-backends/distinfo index d085adcdab43..a27e4255a3b9 100644 --- a/sysutils/system-tools-backends/distinfo +++ b/sysutils/system-tools-backends/distinfo @@ -1,3 +1,3 @@ -MD5 (gnome2/system-tools-backends-2.8.3.tar.bz2) = 403bf4b7c82455d995d6aa54613246c2 -SHA256 (gnome2/system-tools-backends-2.8.3.tar.bz2) = 67629bb6502a4c5b8b639867deb40ecabd5676a4655c264c1f0dbeb97de5c98c -SIZE (gnome2/system-tools-backends-2.8.3.tar.bz2) = 459208 +MD5 (gnome2/system-tools-backends-2.10.0.tar.bz2) = 01fd8fcfbe5f68492186404c96af915a +SHA256 (gnome2/system-tools-backends-2.10.0.tar.bz2) = 5afea48c0c195dd3b6e0b87a586c08bf614942d4bcb60449fd9f65d95418b60d +SIZE (gnome2/system-tools-backends-2.10.0.tar.bz2) = 461621 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 32020815df1f..000000000000 --- a/sysutils/system-tools-backends/files/patch-Users_Users.pm +++ /dev/null @@ -1,366 +0,0 @@ ---- Users/Users.pm.orig 2009-11-02 17:44:21.000000000 -0500 -+++ Users/Users.pm 2010-01-10 19:03:46.000000000 -0500 -@@ -378,10 +379,17 @@ sub get - my ($ifh, @users, %users_hash); - my (@line, @users); - -+ $NO_SHELL = "/usr/bin/nologin"; # lpm: Sets login field to nologin, if it's left to null, stb can't read passwd file -+ # This is important, because in FreeBSD if there is a null in this field, stb -+ # won't create the user account. This is one of the reasons why users couldn't -+ # be created in FreeBSD for gnome using stb! :) Problem solved. -+ - # Find the passwd file. - $ifh = &Utils::File::open_read_from_names(@passwd_names); - return unless ($ifh); - -+ -+ - while (<$ifh>) - { - chomp; -@@ -396,6 +404,9 @@ sub get - push @comment, "" while (scalar (@comment) < 5); - $line[$COMMENT] = [@comment]; - -+ -+ $line[$SHELL] = $NO_SHELL if(!$line[$SHELL] || $line[$SHELL] eq ""); # check for null or empty login field, and set -+ - $users_hash{$login} = [@line]; - } - -@@ -439,32 +450,32 @@ sub get - sub del_user - { - my ($user) = @_; -- my (@command); -+ my ($command); - - if ($Utils::Backend::tool{"system"} eq "FreeBSD") - { -- @command = ($cmd_pw, "userdel", "-n", $$user[$LOGIN]); -+ $command = "$cmd_pw userdel -n \'" . $$user[$LOGIN] . "\' -r "; - } - else - { - if ($cmd_deluser) - { -- @command = ($cmd_deluser, $$user[$LOGIN]); -+ $command = "$cmd_deluser '". $$user[$LOGIN] . "'"; - } - else - { -- @command = ($cmd_userdel, $$user[$LOGIN]); -+ $command = "$cmd_userdel \'" . $$user[$LOGIN] . "\'"; - } - } - -- &Utils::File::run (@command); -+ &Utils::File::run ($command); - } - - sub change_user_chfn - { - my ($login, $old_comment, $comment) = @_; - my ($fname, $office, $office_phone, $home_phone); -- my (@command, $str); -+ my ($command, $str); - - return if !$login; - -@@ -474,15 +485,14 @@ sub change_user_chfn - - if ($Utils::Backend::tool{"system"} eq "FreeBSD") - { -- @command = ($cmd_pw, "usermod", "-n", $login, -- "-c", $str); -+ $command = "$cmd_pw usermod -n " . $login . " -c \'" . $str . "\'"; - } - else - { -- @command = ($cmd_usermod, "-c", $str, $login); -+ $command = "$cmd_usermod -c \'" . $str . "\' " . $login; - } - -- &Utils::File::run (@command); -+ &Utils::File::run ($command); - } - - # modifies /etc/shadow directly, not good practice, -@@ -516,11 +526,11 @@ sub modify_shadow_password - sub set_passwd - { - my ($login, $password) = @_; -- my ($pwdpipe); -+ my ($pwdpipe, $command); - - if ($Utils::Backend::tool{"system"} eq "FreeBSD") - { -- my ($command); -+ - $command = "$cmd_pw usermod -H 0"; - $pwdpipe = &Utils::File::run_pipe_write ($command); - print $pwdpipe $password; -@@ -532,105 +542,156 @@ sub set_passwd - } - else - { -- my (@command); -- @command = ($cmd_usermod, "-p", $password, $login); -+ $command = "$cmd_usermod " . -+ " -p '" . $password . "' " . $login; - -- &Utils::File::run (@command); -+ &Utils::File::run ($command); - } - } - - sub add_user - { -- my ($user) = @_; -- my ($home_parents, $tool_mkdir); -+ my ($user) = @_; # paramaters coming into function. -+ my ($home_parents, $tool_mkdir); - - $tool_mkdir = &Utils::File::locate_tool ("mkdir"); - - if ($Utils::Backend::tool{"system"} eq "FreeBSD") - { -+ # Author: Larry P. Maloney (larry@kiputers.com) or larrypatrickmaloney@yahoo.com -+ # Date: 09/09/2009, 10/07/09, 12/30/2009 -+ # Provides: User creation in FreeBSD -+ # Requires: All services that GDM or "gnome_enable" in rc.conf would start -+ # Cleaned up /etc/passwd file (NULLS are NOT permited in /etc/passwd, and passwd -+ # file must be perfect (no screwed up fields) -+ # Update: 10/07/09, added code to automatically add /usr/bin/nologin to records in /etc/passwd -+ # -+ # Notes: These changes will enable user creation on FreeBSD. -+ # The creation of the user account requires that the /etc/passwd file -+ # be cleaned first. (Need to add code to pre-process /etc/passwd) Each password record in the -+ # file must have values. No NULLS allowed, or stb will not be able to edit the records. -+ # On FreeBSD there is a "toor" account. This account by default has a NULL value for -+ # the login program. This NULL should be substitued with /usr/local/nologin -+ # Please make sure all your fields are without NULL's before trying to edit/add a user. -+ # -+ # New Feature: This patch will enable creation of the user account WITH the additional fields, -+ # Full Name, Location, Home Phone and Work Phone. -+ # -+ # Changes: I essentially did 3 things. One, cleaned up the /etc/passwd file on my local machine -+ # Correctly built the string to be passed to the 'pw' command in BSD (with the -C option -+ # for comments. And Three, added the call to Utils::Run. -+ # -+ # ToDo: Enable creation of accounts WITHOUT passwords -+ # Automatically clean up (swap nulls with default values) in /etc/passwd file. -+ - my $pwdpipe; - my $home; -+ my $user_login; # lpm: $user was redfined THIS IS THE DAMN PROBLEM! User was redfined and set to empty! - -- # FreeBSD doesn't create the home directory - $home = $$user[$HOME]; -- &Utils::File::run ($tool_mkdir, "-p", $home); -+ $user_login = $$user[$LOGIN]; - -+ #get the group name (not just the ID) -+ $group_command = "$cmd_pw groupshow -g " . "\'" .$$user[$GID] . "\'"; -+ $group_name = qx($group_command); -+ @tokens=split(/:/,$group_name); -+ $group_string = $tokens[0]; -+ -+ -+ #modified by lpm, 09/04/09 - $command = "$cmd_pw useradd " . - " -n \'" . $$user[$LOGIN] . "\'" . - " -u \'" . $$user[$UID] . "\'" . - " -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 -+ -+ # added by lpm to get comment fields. -+ $aref=@$user[$COMMENT]; # default is $$user[$COMMENT] -+ $comment = "@$aref[0],@$aref[1],@$aref[2],@$aref[3],"; -+ -+ $command = $command . " -c \"" . $comment . "\""; #comment field must have quotes included before sending to pw command. - --# @command = ($cmd_pw, "useradd", "-n", $$user[$LOGIN], --# "-u", $$user[$UID], --# "-d", $$user[$HOME], --# "-g", $$user[$GID], --# "-s", $$user[$SHELL], --# "-H", "0"); # pw(8) reads password from STDIN -+ $pwdpipe = &Utils::File::run_pipe_write ($command); - -- $pwdpipe = &Utils::File::run_pipe_write ($command); -- print $pwdpipe $$user[$PASSWD]; -- &Utils::File::close_file ($pwdpipe); -+ print $pwdpipe $$user[$PASSWD]; -+ -+ #&Utils::File::run ($command); #added by lpm, doesn't look like the command is getting run? -+ -+ -+ -+ { -+ $group_command = "$cmd_pw groupshow -g " . "\'" .$$user[$GID] . "\'"; -+ $group_name = qx($group_command); -+ -+ @tokens=split(/:/,$group_name); -+ $group_string = $tokens[0]; -+ } -+ -+ -+ -+ &Utils::File::close_file ($pwdpipe); -+ &Utils::File::run ("chown -R $user_login $home"); -+ - } - elsif ($Utils::Backend::tool{"system"} eq "SunOS") - { - $home_parents = $$user[$HOME]; - $home_parents =~ s/\/+[^\/]+\/*$//; -- &Utils::File::run ($tool_mkdir, "-p", $home_parents); -+ &Utils::File::run ("$tool_mkdir -p $home_parents"); - -- @command = ($cmd_useradd, "-d", $$user[$HOME], -- "-g", $$user[$GID], -- "-s", $$user[$SHELL], -- "-u", $$user[$UID], -- $$user[$LOGIN]); -+ $command = "$cmd_useradd" . -+ " -d \'" . $$user[$HOME] . "\'" . -+ " -g \'" . $$user[$GID] . "\'" . -+ " -s \'" . $$user[$SHELL] . "\'" . -+ " -u \'" . $$user[$UID] . "\'" . -+ " \'" . $$user[$LOGIN] . "\'"; - -- &Utils::File::run (@command); -+ &Utils::File::run ($command); - &modify_shadow_password ($$user[$LOGIN], $$user[$PASSWD]); - } - else - { - $home_parents = $$user[$HOME]; - $home_parents =~ s/\/+[^\/]+\/*$//; -- &Utils::File::run ($tool_mkdir, "-p", $home_parents); -+ &Utils::File::run ("$tool_mkdir -p $home_parents"); - - if ($cmd_adduser && - $Utils::Backend::tool{"platform"} !~ /^slackware/ && - $Utils::Backend::tool{"platform"} !~ /^archlinux/ && -- $Utils::Backend::tool{"platform"} !~ /^redhat/ && -- $Utils::Backend::tool{"platform"} !~ /^gentoo/) -+ $Utils::Backend::tool{"platform"} !~ /^redhat/) - { - # use adduser if available and valid (slackware one is b0rk) - # set empty gecos fields and password, they will be filled out later -- @command = ($cmd_adduser, "--gecos", "", -- "--disabled-password", -- "--home", $$user[$HOME], -- "--gid", $$user[$GID], -- "--shell", $$user[$SHELL], -- "--uid", $$user[$UID], -- $$user[$LOGIN]); -+ $command = "$cmd_adduser --gecos '' --disabled-password" . -+ " --home \'" . $$user[$HOME] . "\'" . -+ " --gid \'" . $$user[$GID] . "\'" . -+ " --shell \'" . $$user[$SHELL] . "\'" . -+ " --uid \'" . $$user[$UID] . "\'" . -+ " \'" . $$user[$LOGIN] . "\'"; - -- &Utils::File::run (@command); -+ &Utils::File::run ($command); - - # password can't be set in non-interactive - # mode with adduser, call usermod instead -- @command = ($cmd_usermod, "-p", $$user[$PASSWD], $$user[$LOGIN]); -+ $command = "$cmd_usermod " . -+ " -p '" . $$user[$PASSWD] . "' " . $$user[$LOGIN]; - -- &Utils::File::run (@command); -+ &Utils::File::run ($command); - } - else - { - # fallback to useradd -- @command = ($cmd_useradd, "-m", -- "-d", $$user[$HOME], -- "-g", $$user[$GID], -- "-p", $$user[$PASSWD], -- "-s", $$user[$SHELL], -- "-u", $$user[$UID], -- $$user[$LOGIN]); -+ $command = "$cmd_useradd -m" . -+ " -d \'" . $$user[$HOME] . "\'" . -+ " -g \'" . $$user[$GID] . "\'" . -+ " -p \'" . $$user[$PASSWD] . "\'" . -+ " -s \'" . $$user[$SHELL] . "\'" . -+ " -u \'" . $$user[$UID] . "\'" . -+ " \'" . $$user[$LOGIN] . "\'"; - -- &Utils::File::run (@command); -+ &Utils::File::run ($command); - } - } - -@@ -644,14 +705,14 @@ sub change_user - if ($Utils::Backend::tool{"system"} eq "FreeBSD") - { - my $pwdpipe; -- -+ #lpm note: You can add -k here for a skelton directory to build user directories with default files! :) - $command = "$cmd_pw usermod \'" . $$old_user[$LOGIN] . "\'" . - " -l \'" . $$new_user[$LOGIN] . "\'" . - " -u \'" . $$new_user[$UID] . "\'" . - " -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]; -@@ -659,27 +720,29 @@ sub change_user - } - elsif ($Utils::Backend::tool{"system"} eq "SunOS") - { -- @command = ($cmd_usermod, "-d", $$new_user[$HOME], -- "-g", $$new_user[$GID], -- "-l", $$new_user[$LOGIN], -- "-s", $$new_user[$SHELL], -- "-u", $$new_user[$UID], -- $$old_user[$LOGIN]); -+ $command = "$cmd_usermod" . -+ " -d \'" . $$new_user[$HOME] . "\'" . -+ " -g \'" . $$new_user[$GID] . "\'" . -+ " -l \'" . $$new_user[$LOGIN] . "\'" . -+ " -s \'" . $$new_user[$SHELL] . "\'" . -+ " -u \'" . $$new_user[$UID] . "\'" . -+ " \'" . $$old_user[$LOGIN] . "\'"; - -- &Utils::File::run (@command); -+ &Utils::File::run ($command); - &modify_shadow_password ($$new_user[$LOGIN], $$new_user[$PASSWD]); - } - else - { -- @command = ($cmd_usermod, "-d", $$new_user[$HOME], -- "-g", $$new_user[$GID], -- "-l", $$new_user[$LOGIN], -- "-p", $$new_user[$PASSWD], -- "-s", $$new_user[$SHELL], -- "-u", $$new_user[$UID], -- $$old_user[$LOGIN]); -+ $command = "$cmd_usermod" . -+ " -d \'" . $$new_user[$HOME] . "\'" . -+ " -g \'" . $$new_user[$GID] . "\'" . -+ " -l \'" . $$new_user[$LOGIN] . "\'" . -+ " -p \'" . $$new_user[$PASSWD] . "\'" . -+ " -s \'" . $$new_user[$SHELL] . "\'" . -+ " -u \'" . $$new_user[$UID] . "\'" . -+ " \'" . $$old_user[$LOGIN] . "\'"; - -- &Utils::File::run (@command); -+ &Utils::File::run ($command); - } - - &change_user_chfn ($$new_user[$LOGIN], $$old_user[$COMMENT], $$new_user[$COMMENT]); diff --git a/sysutils/system-tools-backends/files/patch-Utils_Platform.pm b/sysutils/system-tools-backends/files/patch-Utils_Platform.pm new file mode 100644 index 000000000000..c22ec910fad3 --- /dev/null +++ b/sysutils/system-tools-backends/files/patch-Utils_Platform.pm @@ -0,0 +1,18 @@ +--- Utils/Platform.pm.orig 2010-04-02 00:17:39.000000000 +0200 ++++ Utils/Platform.pm 2010-04-02 00:18:30.000000000 +0200 +@@ -73,6 +73,7 @@ my $PLATFORM_INFO = { + "freebsd-6" => [ "FreeBSD", "6", "" ], + "freebsd-7" => [ "FreeBSD", "7", "" ], + "freebsd-8" => [ "FreeBSD", "8", "" ], ++ "freebsd-9" => [ "FreeBSD", "9", "" ], + "gentoo" => [ "Gentoo Linux", "", "" ], + "vlos-1.2" => [ "Vida Linux OS", "1.2" ], + "archlinux" => [ "Arch Linux", "", "" ], +@@ -126,6 +127,7 @@ sub ensure_distro_map + "freebsd-6" => "freebsd-5", + "freebsd-7" => "freebsd-5", + "freebsd-8" => "freebsd-5", ++ "freebsd-9" => "freebsd-5", + "openna-1.0" => "redhat-6.2", + "pld-1.1" => "pld-1.0", + "pld-1.99" => "pld-1.0", diff --git a/sysutils/system-tools-backends/pkg-plist b/sysutils/system-tools-backends/pkg-plist index e0f62d8b1ae3..9fcee66acdc6 100644 --- a/sysutils/system-tools-backends/pkg-plist +++ b/sysutils/system-tools-backends/pkg-plist @@ -1,17 +1,20 @@ 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.GroupConfig2.service +share/dbus-1/system-services/org.freedesktop.SystemToolsBackends.GroupsConfig2.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.SelfConfig2.service +share/dbus-1/system-services/org.freedesktop.SystemToolsBackends.ServiceConfig2.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.UserConfig2.service +share/dbus-1/system-services/org.freedesktop.SystemToolsBackends.UsersConfig2.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 @@ -36,6 +39,7 @@ 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/nb/LC_MESSAGES/system-tools-backends.mo +share/locale/nds/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 @@ -58,6 +62,7 @@ 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/GroupConfig.pm 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 @@ -69,6 +74,8 @@ 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/SelfConfig.pm +share/system-tools-backends-2.0/scripts/ServiceConfig.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 @@ -101,33 +108,13 @@ share/system-tools-backends-2.0/scripts/Utils/XML.pm @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/nds/LC_MESSAGES +@dirrmtry share/locale/nds @dirrmtry share/locale/bn_IN/LC_MESSAGES @dirrmtry share/locale/bn_IN diff --git a/sysutils/tracker-client/Makefile b/sysutils/tracker-client/Makefile index 801b0bdb1881..7ca1cd24f66a 100644 --- a/sysutils/tracker-client/Makefile +++ b/sysutils/tracker-client/Makefile @@ -3,12 +3,12 @@ # Whom: Michael Johnson <ahze@FreeBSD.org> # # $FreeBSD$ -# $MCom: ports/sysutils/tracker-client/Makefile,v 1.10 2009/10/11 11:11:33 kwm Exp $ +# $MCom: ports/sysutils/tracker-client/Makefile,v 1.14 2010/05/10 04:21:19 marcus Exp $ # PORTNAME= tracker PORTVERSION= 0.6.95 -PORTREVISION= 4 +PORTREVISION= 5 CATEGORIES= sysutils gnome MASTER_SITES= GNOME PKGNAMESUFFIX?= -client @@ -25,7 +25,7 @@ LIB_DEPENDS= sqlite3.8:${PORTSDIR}/databases/sqlite3 \ qdbm.14:${PORTSDIR}/databases/qdbm \ exempi.3:${PORTSDIR}/textproc/exempi \ hal.1:${PORTSDIR}/sysutils/hal \ - totem-plparser.12:${PORTSDIR}/multimedia/totem-pl-parser \ + totem-plparser.17:${PORTSDIR}/multimedia/totem-pl-parser \ raptor.2:${PORTSDIR}/textproc/raptor \ ogg.6:${PORTSDIR}/audio/libogg \ iptcdata.3:${PORTSDIR}/graphics/libiptcdata diff --git a/sysutils/tracker-client/pkg-plist b/sysutils/tracker-client/pkg-plist index e55381d7c1de..f51b198ec50c 100644 --- a/sysutils/tracker-client/pkg-plist +++ b/sysutils/tracker-client/pkg-plist @@ -291,12 +291,6 @@ share/locale/zh_CN/LC_MESSAGES/tracker.mo @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 @@ -308,3 +302,9 @@ share/locale/zh_CN/LC_MESSAGES/tracker.mo @dirrm include/tracker-1.0/libtracker-module @dirrm include/tracker-1.0/libtracker-common @dirrm include/tracker-1.0 +@dirrmtry share/locale/oc/LC_MESSAGES +@dirrmtry share/locale/oc +@dirrmtry share/locale/dz/LC_MESSAGES +@dirrmtry share/locale/dz +@dirrmtry share/locale/be@latin/LC_MESSAGES +@dirrmtry share/locale/be@latin diff --git a/sysutils/upower/Makefile b/sysutils/upower/Makefile new file mode 100644 index 000000000000..ddbef6fd8011 --- /dev/null +++ b/sysutils/upower/Makefile @@ -0,0 +1,48 @@ +# New ports collection makefile for: DeviceKit-power +# Date Created: 30 December 2009 +# Whom: Joe Marcus Clarke <marcus@FreeBSD.org> +# +# $FreeBSD$ +# $MCom: ports/sysutils/upower/Makefile,v 1.15 2010/05/09 17:43:53 marcus Exp $ +# + +PORTNAME= upower +DISTVERSION= 0.9.3 +CATEGORIES= sysutils +MASTER_SITES= http://upower.freedesktop.org/releases/ + +MAINTAINER= gnome@FreeBSD.org +COMMENT= D-Bus daemon for simplifying power management tasks + +BUILD_DEPENDS= g-ir-scanner:${PORTSDIR}/devel/gobject-introspection +LIB_DEPENDS= polkit-gobject-1.0:${PORTSDIR}/sysutils/polkit \ + dbus-glib-1.2:${PORTSDIR}/devel/dbus-glib +RUN_DEPENDS= ${LOCALBASE}/lib/girepository-1.0/GObject-2.0.typelib:${PORTSDIR}/devel/gobject-introspection + +USE_GETTEXT= yes +USE_BZIP2= yes +USE_GMAKE= yes +USE_GNOME= gnomehack intlhack ltverhack glib20 +USE_AUTOTOOLS= libtool:22 +USE_LDCONFIG= yes +USE_PYTHON= yes +CONFIGURE_ARGS= --disable-gtk-doc \ + --with-backend=freebsd \ + --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/dtd/catalog:${PORTSDIR}/textproc/docbook-410 \ + ${LOCALBASE}/share/xml/docbook/4.1.2/docbookx.dtd:${PORTSDIR}/textproc/docbook-sk \ + xsltproc:${PORTSDIR}/textproc/libxslt \ + ${LOCALBASE}/share/xsl/docbook/manpages/docbook.xsl:${PORTSDIR}/textproc/docbook-xsl +MAN1= upower.1 +MAN7= UPower.7 +MAN8= upowerd.8 +.endif + +.include <bsd.port.mk> diff --git a/sysutils/upower/distinfo b/sysutils/upower/distinfo new file mode 100644 index 000000000000..066e883b1407 --- /dev/null +++ b/sysutils/upower/distinfo @@ -0,0 +1,3 @@ +MD5 (upower-0.9.3.tar.bz2) = 18cd3809d3869b889b094d1b9dbe88e9 +SHA256 (upower-0.9.3.tar.bz2) = 05eb4bd73493c779a6972893d7439f92ca8cc30cd81cf00663cfb4dca10896a1 +SIZE (upower-0.9.3.tar.bz2) = 468427 diff --git a/sysutils/upower/files/patch-src_freebsd_up-backend.c b/sysutils/upower/files/patch-src_freebsd_up-backend.c new file mode 100644 index 000000000000..f6ad1181572b --- /dev/null +++ b/sysutils/upower/files/patch-src_freebsd_up-backend.c @@ -0,0 +1,19 @@ +--- src/freebsd/up-backend.c.orig 2010-05-09 13:40:33.000000000 -0400 ++++ src/freebsd/up-backend.c 2010-05-09 13:42:27.000000000 -0400 +@@ -298,16 +298,6 @@ up_backend_coldplug (UpBackend *backend, + } + + /** +- * up_backend_get_powersave_command: +- **/ +-const gchar * +-up_backend_get_powersave_command (UpBackend *backend, gboolean powersave) +-{ +- /* XXX: Do we want to use powerd here? */ +- return NULL; +-} +- +-/** + * up_backend_get_suspend_command: + **/ + const gchar * diff --git a/sysutils/upower/files/patch-src_up-daemon.c b/sysutils/upower/files/patch-src_up-daemon.c new file mode 100644 index 000000000000..eea72a87b7c1 --- /dev/null +++ b/sysutils/upower/files/patch-src_up-daemon.c @@ -0,0 +1,20 @@ +--- src/up-daemon.c.orig 2010-04-19 11:58:18.000000000 -0400 ++++ src/up-daemon.c 2010-05-09 13:38:28.000000000 -0400 +@@ -488,6 +488,8 @@ up_daemon_suspend_allowed (UpDaemon *dae + goto out; + + ret = up_polkit_is_allowed (priv->polkit, subject, "org.freedesktop.upower.suspend", context); ++ if (!ret) ++ goto out; + dbus_g_method_return (context, ret); + + out: +@@ -575,6 +577,8 @@ up_daemon_hibernate_allowed (UpDaemon *d + goto out; + + ret = up_polkit_is_allowed (priv->polkit, subject, "org.freedesktop.upower.hibernate", context); ++ if (!ret) ++ goto out; + dbus_g_method_return (context, ret); + + out: diff --git a/sysutils/upower/files/patch-src_up-polkit.c b/sysutils/upower/files/patch-src_up-polkit.c new file mode 100644 index 000000000000..88a074e9908c --- /dev/null +++ b/sysutils/upower/files/patch-src_up-polkit.c @@ -0,0 +1,20 @@ +--- src/up-polkit.c.orig 2010-04-08 21:38:56.000000000 -0400 ++++ src/up-polkit.c 2010-04-09 02:48:12.000000000 -0400 +@@ -69,7 +69,7 @@ up_polkit_check_auth (UpPolkit *polkit, + { + gboolean ret = FALSE; + GError *error; +- GError *error_local; ++ GError *error_local = NULL; + PolkitAuthorizationResult *result; + + /* check auth */ +@@ -104,7 +104,7 @@ up_polkit_is_allowed (UpPolkit *polkit, + { + gboolean ret = FALSE; + GError *error; +- GError *error_local; ++ GError *error_local = NULL; + PolkitAuthorizationResult *result; + + /* check auth */ diff --git a/sysutils/upower/pkg-descr b/sysutils/upower/pkg-descr new file mode 100644 index 000000000000..348f53146ab8 --- /dev/null +++ b/sysutils/upower/pkg-descr @@ -0,0 +1,6 @@ +UPower is an abstraction for enumerating power devices, +listening to device events and querying history and statistics. +Any application or service on the system can access the +org.freedesktop.DeviceKit.Power service via the system message bus. + +WWW: http://upower.freedesktop.org/ diff --git a/sysutils/upower/pkg-plist b/sysutils/upower/pkg-plist new file mode 100644 index 000000000000..8f96cd1fc98c --- /dev/null +++ b/sysutils/upower/pkg-plist @@ -0,0 +1,55 @@ +bin/devkit-power +bin/upower +etc/UPower/UPower.conf +etc/dbus-1/system.d/org.freedesktop.UPower.conf +include/DeviceKit-power/devkit-power-gobject/devicekit-power.h +include/DeviceKit-power/devkit-power-gobject/dkp-client.h +include/DeviceKit-power/devkit-power-gobject/dkp-device.h +include/DeviceKit-power/devkit-power-gobject/dkp-enum.h +include/DeviceKit-power/devkit-power-gobject/dkp-history-obj.h +include/DeviceKit-power/devkit-power-gobject/dkp-qos-obj.h +include/DeviceKit-power/devkit-power-gobject/dkp-stats-obj.h +include/DeviceKit-power/devkit-power-gobject/dkp-version.h +include/DeviceKit-power/devkit-power-gobject/dkp-wakeups-obj.h +include/DeviceKit-power/devkit-power-gobject/dkp-wakeups.h +include/libupower-glib/up-client.h +include/libupower-glib/up-device.h +include/libupower-glib/up-history-item.h +include/libupower-glib/up-qos-item.h +include/libupower-glib/up-stats-item.h +include/libupower-glib/up-types.h +include/libupower-glib/up-version.h +include/libupower-glib/up-wakeup-item.h +include/libupower-glib/up-wakeups.h +include/libupower-glib/upower.h +lib/girepository-1.0/UPowerGlib-1.0.typelib +lib/libdevkit-power-gobject.a +lib/libdevkit-power-gobject.la +lib/libdevkit-power-gobject.so +lib/libdevkit-power-gobject.so.1 +lib/libupower-glib.a +lib/libupower-glib.la +lib/libupower-glib.so +lib/libupower-glib.so.1 +libdata/pkgconfig/devkit-power-gobject.pc +libdata/pkgconfig/upower-glib.pc +libexec/devkit-power-daemon +libexec/upowerd +share/dbus-1/interfaces/org.freedesktop.UPower.Device.xml +share/dbus-1/interfaces/org.freedesktop.UPower.QoS.xml +share/dbus-1/interfaces/org.freedesktop.UPower.Wakeups.xml +share/dbus-1/interfaces/org.freedesktop.UPower.xml +share/dbus-1/system-services/org.freedesktop.UPower.service +share/gir-1.0/UPowerGlib-1.0.gir +share/locale/it/LC_MESSAGES/upower.mo +share/locale/pl/LC_MESSAGES/upower.mo +share/locale/sv/LC_MESSAGES/upower.mo +share/polkit-1/actions/org.freedesktop.upower.policy +share/polkit-1/actions/org.freedesktop.upower.qos.policy +@exec mkdir -p /var/lib/DeviceKit-power +@dirrm include/DeviceKit-power/devkit-power-gobject +@dirrm include/DeviceKit-power +@dirrm include/libupower-glib +@dirrm etc/UPower +@unexec rmdir /var/lib/DeviceKit-power 2>/dev/null || true +@unexec rmdir /var/lib 2>/dev/null || true |