Update to 20081219:

Lots of updates (basically a db).

5 files changed, 59 insertions, 37 deletions

diff --git a/sysutils/hal-info/Makefile b/sysutils/hal-info/Makefile
index cc47f80acd7..26d0200c957 100644
--- a/sysutils/hal-info/Makefile
+++ b/sysutils/hal-info/Makefile
@@ -1,8 +1,7 @@
-# $NetBSD: Makefile,v 1.2 2008/12/26 15:33:03 jmcneill Exp $
+# $NetBSD: Makefile,v 1.3 2009/01/07 22:18:16 wiz Exp $
 #
 
-DISTNAME=		hal-info-20081022
-PKGREVISION=		1
+DISTNAME=		hal-info-20081219
 CATEGORIES=		sysutils
 MASTER_SITES=		http://hal.freedesktop.org/releases/
 
diff --git a/sysutils/hal-info/PLIST b/sysutils/hal-info/PLIST
index 1441897fc48..5b411a3383c 100644
--- a/sysutils/hal-info/PLIST
+++ b/sysutils/hal-info/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.1.1.1 2008/11/22 13:04:41 jmcneill Exp $
+@comment $NetBSD: PLIST,v 1.2 2009/01/07 22:18:16 wiz Exp $
 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
@@ -6,6 +6,7 @@ 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
@@ -44,8 +45,12 @@ 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
+@exec ${MKDIR} %D/share/hal/fdi/policy/10osvendor
+@dirrm share/hal/fdi/policy/10osvendor
+@dirrm share/hal/fdi/policy
 @exec ${MKDIR} %D/share/hal/fdi/preprobe/20thirdparty
 @dirrm share/hal/fdi/preprobe/20thirdparty
 @dirrm share/hal/fdi/preprobe/10osvendor
diff --git a/sysutils/hal-info/distinfo b/sysutils/hal-info/distinfo
index 21ea9e07bb9..1b9dd94f3fc 100644
--- a/sysutils/hal-info/distinfo
+++ b/sysutils/hal-info/distinfo
@@ -1,7 +1,7 @@
-$NetBSD: distinfo,v 1.2 2008/12/26 15:33:04 jmcneill Exp $
+$NetBSD: distinfo,v 1.3 2009/01/07 22:18:16 wiz Exp $
 
-SHA1 (hal-info-20081022.tar.gz) = f5e6b6351eafaf71946a581922ddb86e9f48641d
-RMD160 (hal-info-20081022.tar.gz) = fae14fe9d603329f4839ac7aee6f4602f591dc1b
-Size (hal-info-20081022.tar.gz) = 226411 bytes
-SHA1 (patch-aa) = 487e4a30c0cb80f96a07db3a5f68d4f81cf585e2
-SHA1 (patch-ab) = 2b0e3f2ba9a362e0b4fb203987d124ea7e971281
+SHA1 (hal-info-20081219.tar.gz) = d2231f32133eac4ab53f4e13b68df9f2027dc0e0
+RMD160 (hal-info-20081219.tar.gz) = 2e81127e95050818121020c17ac34a2a81863b3f
+Size (hal-info-20081219.tar.gz) = 235508 bytes
+SHA1 (patch-aa) = 1b2c6515e28584a1da6b1554f28210ffc93193b7
+SHA1 (patch-ab) = d480299f24cccbfc9a3b65331c790cc11cd86c32
diff --git a/sysutils/hal-info/patches/patch-aa b/sysutils/hal-info/patches/patch-aa
index 9e5c9df1785..452947e425e 100644
--- a/sysutils/hal-info/patches/patch-aa
+++ b/sysutils/hal-info/patches/patch-aa
@@ -1,8 +1,8 @@
-$NetBSD: patch-aa,v 1.1.1.1 2008/11/22 13:04:41 jmcneill Exp $
+$NetBSD: patch-aa,v 1.2 2009/01/07 22:18:16 wiz Exp $
 
---- configure.orig	2008-11-18 15:52:36.000000000 -0500
+--- configure.orig	2008-12-19 13:58:53.000000000 +0100
 +++ configure
-@@ -3557,7 +3557,7 @@ else
+@@ -3568,7 +3568,7 @@ else
    enable_recall=yes
  fi
  
@@ -11,7 +11,7 @@ $NetBSD: patch-aa,v 1.1.1.1 2008/11/22 13:04:41 jmcneill Exp $
    BUILD_RECALL_TRUE=
    BUILD_RECALL_FALSE='#'
  else
-@@ -3573,7 +3573,7 @@ else
+@@ -3584,7 +3584,7 @@ else
    enable_video=yes
  fi
  
@@ -20,7 +20,25 @@ $NetBSD: patch-aa,v 1.1.1.1 2008/11/22 13:04:41 jmcneill Exp $
    BUILD_VIDEO_TRUE=
    BUILD_VIDEO_FALSE='#'
  else
-@@ -3589,7 +3589,7 @@ else
+@@ -3600,7 +3600,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
+@@ -3616,7 +3616,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
+@@ -3632,7 +3632,7 @@ else
    enable_keymaps=yes
  fi
  
@@ -29,7 +47,7 @@ $NetBSD: patch-aa,v 1.1.1.1 2008/11/22 13:04:41 jmcneill Exp $
    BUILD_KEYMAPS_TRUE=
    BUILD_KEYMAPS_FALSE='#'
  else
-@@ -3605,7 +3605,7 @@ else
+@@ -3648,7 +3648,7 @@ else
    enable_killswitch_dell_wlan=yes
  fi
  
@@ -38,7 +56,7 @@ $NetBSD: patch-aa,v 1.1.1.1 2008/11/22 13:04:41 jmcneill Exp $
    BUILD_KILLSWITCH_DELL_WLAN_TRUE=
    BUILD_KILLSWITCH_DELL_WLAN_FALSE='#'
  else
-@@ -3621,7 +3621,7 @@ else
+@@ -3664,7 +3664,7 @@ else
    enable_killswitch_dell_bluetooth=yes
  fi
  
@@ -47,7 +65,7 @@ $NetBSD: patch-aa,v 1.1.1.1 2008/11/22 13:04:41 jmcneill Exp $
    BUILD_KILLSWITCH_DELL_BLUETOOTH_TRUE=
    BUILD_KILLSWITCH_DELL_BLUETOOTH_FALSE='#'
  else
-@@ -3637,7 +3637,7 @@ else
+@@ -3680,7 +3680,7 @@ else
    enable_killswitch_dell_wwan=yes
  fi
  
@@ -56,7 +74,7 @@ $NetBSD: patch-aa,v 1.1.1.1 2008/11/22 13:04:41 jmcneill Exp $
    BUILD_KILLSWITCH_DELL_WWAN_TRUE=
    BUILD_KILLSWITCH_DELL_WWAN_FALSE='#'
  else
-@@ -3653,7 +3653,7 @@ else
+@@ -3696,7 +3696,7 @@ else
    enable_killswitch_sony_bluetooth=yes
  fi
  
@@ -65,7 +83,7 @@ $NetBSD: patch-aa,v 1.1.1.1 2008/11/22 13:04:41 jmcneill Exp $
    BUILD_KILLSWITCH_SONY_BLUETOOTH_TRUE=
    BUILD_KILLSWITCH_SONY_BLUETOOTH_FALSE='#'
  else
-@@ -3669,7 +3669,7 @@ else
+@@ -3712,7 +3712,7 @@ else
    enable_killswitch_thinkpad_bluetooth=yes
  fi
  
@@ -74,7 +92,7 @@ $NetBSD: patch-aa,v 1.1.1.1 2008/11/22 13:04:41 jmcneill Exp $
    BUILD_KILLSWITCH_THINKPAD_BLUETOOTH_TRUE=
    BUILD_KILLSWITCH_THINKPAD_BLUETOOTH_FALSE='#'
  else
-@@ -3685,7 +3685,7 @@ else
+@@ -3728,7 +3728,7 @@ else
    enable_killswitch_ipw_wlan=yes
  fi
  
@@ -83,3 +101,12 @@ $NetBSD: patch-aa,v 1.1.1.1 2008/11/22 13:04:41 jmcneill Exp $
    BUILD_KILLSWITCH_IPW_WLAN_TRUE=
    BUILD_KILLSWITCH_IPW_WLAN_FALSE='#'
  else
+@@ -3744,7 +3744,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/patches/patch-ab b/sysutils/hal-info/patches/patch-ab
index af58a614025..ddfdb5af4ba 100644
--- a/sysutils/hal-info/patches/patch-ab
+++ b/sysutils/hal-info/patches/patch-ab
@@ -1,23 +1,14 @@
-$NetBSD: patch-ab,v 1.1 2008/12/26 15:33:04 jmcneill Exp $
+$NetBSD: patch-ab,v 1.2 2009/01/07 22:18:16 wiz Exp $
 
---- fdi/information/10freedesktop/10-usb-music-players.fdi.orig	2008-10-20 04:51:31.000000000 -0400
-+++ fdi/information/10freedesktop/10-usb-music-players.fdi	2008-12-26 10:32:13.000000000 -0500
-@@ -911,14 +911,16 @@
- 
-     <match key="info.category" string="storage">
-       <!-- Sony PSP (PlayStation Portable) -->
--      <match key="storage.vendor" string="Sony">
--        <match key="storage.model" string="PSP">
-+      <match key="storage.vendor" string_outof="Sony;SONY">
-+        <match key="storage.model" contains="PSP">
-           <append key="info.capabilities" type="strlist">portable_audio_player</append>
-           <!-- NOTE: for backward compatibility until key get removed finally -->
-           <addset key="portable_audio_player.access_method.protocols" type="strlist">storage</addset>
-           <merge key="portable_audio_player.storage_device" type="copy_property">info.udi</merge>
+--- fdi/information/10freedesktop/10-usb-music-players.fdi.orig	2008-12-19 09:31:45.000000000 +0100
++++ fdi/information/10freedesktop/10-usb-music-players.fdi
+@@ -967,7 +967,9 @@
+           <append key="portable_audio_player.output_formats" type="strlist">audio/x-ms-wma</append>
            <append key="portable_audio_player.output_formats" type="strlist">audio/mpeg</append>
+           <append key="portable_audio_player.output_formats" type="strlist">audio/mp4</append>
 +          <append key="portable_audio_player.output_formats" type="strlist">audio/aac</append>
            <append key="portable_audio_player.output_formats" type="strlist">audio/vnd.sony.atrac3</append>
 +	  <append key="portable_audio_player.audio_folders" type="strlist">MUSIC/</append>
  	  <append key="portable_audio_player.audio_folders" type="strlist">PSP/MUSIC/</append>
+           <merge key="portable_audio_player.folder_depth" type="int">0</merge>
            <merge key="storage.drive_type" type="string">memory_stick</merge>
-         </match>