glib2 now only allows glib.h to be included.

14 files changed, 183 insertions, 1 deletions

diff --git a/sysutils/hal/distinfo b/sysutils/hal/distinfo
index 23ec948ab67..eff25382da1 100644
--- a/sysutils/hal/distinfo
+++ b/sysutils/hal/distinfo
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.23 2012/03/31 16:06:56 ryoon Exp $
+$NetBSD: distinfo,v 1.24 2012/05/14 03:12:01 sbd Exp $
 
 SHA1 (hal-0.5.14.tar.bz2) = a6ec098d78112e18e2773afa5f9ed642b00c4c59
 RMD160 (hal-0.5.14.tar.bz2) = 0314dace9512bf49a62bd1556963fc60a6c9caf9
@@ -31,6 +31,19 @@ SHA1 (patch-hald_freebsd_hf-usb2.c) = 9a1a612fe6f81078ea246fb49ec60157b8641e75
 SHA1 (patch-hald_freebsd_hf-volume.c) = 45f27050f2b0ef8825d32d2bbdcac168c8f5b2b5
 SHA1 (patch-hald_freebsd_probing_probe-usb2-device.c) = eb655ef42d02cd2c6a86004c309e20de942f033b
 SHA1 (patch-hald_freebsd_probing_probe-usb2-interface.c) = 8ad0ac33ae366f7f470b2cb751a31bb99b2e6313
+SHA1 (patch-hald_linux_addons_addon-acpi-buttons-toshiba.c) = 82f266ac27c290470adedfe1ba820a0b5a8e1d27
+SHA1 (patch-hald_linux_addons_addon-cpufreq.c) = 1e94d9a00f57fa4197f460953ba540564fa1441c
+SHA1 (patch-hald_linux_addons_addon-dell-backlight.cpp) = 72bd150adff60dfeca4a261ee9387783a5e99262
+SHA1 (patch-hald_linux_addons_addon-generic-backlight.c) = ebf060a72948e4301477eedbbcaaa766d88265b5
+SHA1 (patch-hald_linux_addons_addon-imac-backlight.c) = c594f0dfb2b659faee9f88a0254db3e9180c2b3d
+SHA1 (patch-hald_linux_addons_addon-input.c) = c893c803e2870af97cdcae23f3c6f66e45234888
+SHA1 (patch-hald_linux_addons_addon-ipw-killswitch.c) = d3d8270dddaa132c3fefbc667f315f697c900245
+SHA1 (patch-hald_linux_addons_addon-leds.c) = e56747b39bf5e6e03286fedcb73ef226c0231bbd
+SHA1 (patch-hald_linux_addons_addon-macbookpro-backlight.c) = c508a7b9070c319679b8b8e715d29410957ba41a
+SHA1 (patch-hald_linux_addons_addon-omap-backlight.c) = 72ba398a1d661fb726778bf7df7460735fee988f
+SHA1 (patch-hald_linux_addons_addon-rfkill-killswitch.c) = 800fac10408b65b12cd644b93b8612c8b2970da0
+SHA1 (patch-hald_linux_addons_addon-storage.c) = 9949c8768395295f27aebc792b8b8091e988d2d9
+SHA1 (patch-hald_linux_addons_addon-usb-csr.c) = 34b5be5ff308f9aafcf505b303d36cbc2483d015
 SHA1 (patch-na) = 2786db8149a55dbd5ea11419d789f420bac1993c
 SHA1 (patch-nb) = 1693b7a2faa5bee20a594f0b60b8ff6caea0efdc
 SHA1 (patch-nc) = 32453e49734902749ce24eb4364fc7f531986227
diff --git a/sysutils/hal/patches/patch-hald_linux_addons_addon-acpi-buttons-toshiba.c b/sysutils/hal/patches/patch-hald_linux_addons_addon-acpi-buttons-toshiba.c
new file mode 100644
index 00000000000..6279686816a
--- /dev/null
+++ b/sysutils/hal/patches/patch-hald_linux_addons_addon-acpi-buttons-toshiba.c
@@ -0,0 +1,13 @@
+$NetBSD: patch-hald_linux_addons_addon-acpi-buttons-toshiba.c,v 1.1 2012/05/14 03:12:01 sbd Exp $
+
+--- hald/linux/addons/addon-acpi-buttons-toshiba.c.orig	2009-08-24 12:42:30.000000000 +0000
++++ hald/linux/addons/addon-acpi-buttons-toshiba.c
+@@ -40,7 +40,7 @@ else
+ #include <string.h>
+ #include <unistd.h>
+ 
+-#include <glib/gmain.h>
++#include <glib.h>
+ 
+ #include "libhal/libhal.h"
+ #include "../../logger.h"
diff --git a/sysutils/hal/patches/patch-hald_linux_addons_addon-cpufreq.c b/sysutils/hal/patches/patch-hald_linux_addons_addon-cpufreq.c
new file mode 100644
index 00000000000..a4084a1ad07
--- /dev/null
+++ b/sysutils/hal/patches/patch-hald_linux_addons_addon-cpufreq.c
@@ -0,0 +1,12 @@
+$NetBSD: patch-hald_linux_addons_addon-cpufreq.c,v 1.1 2012/05/14 03:12:01 sbd Exp $
+
+--- hald/linux/addons/addon-cpufreq.c.orig	2009-08-24 12:42:30.000000000 +0000
++++ hald/linux/addons/addon-cpufreq.c
+@@ -32,7 +32,6 @@
+ #include <unistd.h>
+ #include <signal.h>
+ #include <getopt.h>
+-#include <glib/gprintf.h>
+ 
+ #include "addon-cpufreq.h"
+ #include "addon-cpufreq-userspace.h"
diff --git a/sysutils/hal/patches/patch-hald_linux_addons_addon-dell-backlight.cpp b/sysutils/hal/patches/patch-hald_linux_addons_addon-dell-backlight.cpp
new file mode 100644
index 00000000000..a2bf17164ca
--- /dev/null
+++ b/sysutils/hal/patches/patch-hald_linux_addons_addon-dell-backlight.cpp
@@ -0,0 +1,13 @@
+$NetBSD: patch-hald_linux_addons_addon-dell-backlight.cpp,v 1.1 2012/05/14 03:12:01 sbd Exp $
+
+--- hald/linux/addons/addon-dell-backlight.cpp.orig	2009-08-24 12:42:30.000000000 +0000
++++ hald/linux/addons/addon-dell-backlight.cpp
+@@ -29,7 +29,7 @@
+ 
+ #include <string.h>
+ 
+-#include <glib/gmain.h>
++#include <glib.h>
+ #include <dbus/dbus-glib.h>
+ #include <dbus/dbus-glib-lowlevel.h>
+ 
diff --git a/sysutils/hal/patches/patch-hald_linux_addons_addon-generic-backlight.c b/sysutils/hal/patches/patch-hald_linux_addons_addon-generic-backlight.c
new file mode 100644
index 00000000000..c7f22c60b1b
--- /dev/null
+++ b/sysutils/hal/patches/patch-hald_linux_addons_addon-generic-backlight.c
@@ -0,0 +1,13 @@
+$NetBSD: patch-hald_linux_addons_addon-generic-backlight.c,v 1.1 2012/05/14 03:12:01 sbd Exp $
+
+--- hald/linux/addons/addon-generic-backlight.c.orig	2009-08-24 12:42:30.000000000 +0000
++++ hald/linux/addons/addon-generic-backlight.c
+@@ -35,7 +35,7 @@
+ #include <sys/stat.h>
+ #include <unistd.h> 
+ 
+-#include <glib/gmain.h>
++#include <glib.h>
+ #include <dbus/dbus-glib.h>
+ #include <dbus/dbus-glib-lowlevel.h>
+ 
diff --git a/sysutils/hal/patches/patch-hald_linux_addons_addon-imac-backlight.c b/sysutils/hal/patches/patch-hald_linux_addons_addon-imac-backlight.c
new file mode 100644
index 00000000000..ce7c4baddd6
--- /dev/null
+++ b/sysutils/hal/patches/patch-hald_linux_addons_addon-imac-backlight.c
@@ -0,0 +1,13 @@
+$NetBSD: patch-hald_linux_addons_addon-imac-backlight.c,v 1.1 2012/05/14 03:12:01 sbd Exp $
+
+--- hald/linux/addons/addon-imac-backlight.c.orig	2009-08-24 12:42:30.000000000 +0000
++++ hald/linux/addons/addon-imac-backlight.c
+@@ -29,7 +29,7 @@
+ #include <stdlib.h>
+ #include <sys/io.h>
+ 
+-#include <glib/gmain.h>
++#include <glib.h>
+ #include <dbus/dbus-glib.h>
+ #include <dbus/dbus-glib-lowlevel.h>
+ 
diff --git a/sysutils/hal/patches/patch-hald_linux_addons_addon-input.c b/sysutils/hal/patches/patch-hald_linux_addons_addon-input.c
new file mode 100644
index 00000000000..c9c0613c185
--- /dev/null
+++ b/sysutils/hal/patches/patch-hald_linux_addons_addon-input.c
@@ -0,0 +1,14 @@
+$NetBSD: patch-hald_linux_addons_addon-input.c,v 1.1 2012/05/14 03:12:01 sbd Exp $
+
+--- hald/linux/addons/addon-input.c.orig	2009-08-24 12:42:30.000000000 +0000
++++ hald/linux/addons/addon-input.c
+@@ -41,8 +41,7 @@
+ #else
+   #include <linux/input.h>
+ #endif
+-#include <glib/gmain.h>
+-#include <glib/gprintf.h>
++#include <glib.h>
+ #include <dbus/dbus-glib-lowlevel.h>
+ 
+ #include "libhal/libhal.h"
diff --git a/sysutils/hal/patches/patch-hald_linux_addons_addon-ipw-killswitch.c b/sysutils/hal/patches/patch-hald_linux_addons_addon-ipw-killswitch.c
new file mode 100644
index 00000000000..f61b0ace0e6
--- /dev/null
+++ b/sysutils/hal/patches/patch-hald_linux_addons_addon-ipw-killswitch.c
@@ -0,0 +1,13 @@
+$NetBSD: patch-hald_linux_addons_addon-ipw-killswitch.c,v 1.1 2012/05/14 03:12:01 sbd Exp $
+
+--- hald/linux/addons/addon-ipw-killswitch.c.orig	2009-08-24 12:42:30.000000000 +0000
++++ hald/linux/addons/addon-ipw-killswitch.c
+@@ -36,8 +36,6 @@
+ #include <unistd.h> 
+ 
+ #include <glib.h>
+-#include <glib/gmain.h>
+-#include <glib/gstdio.h>
+ #include <dbus/dbus-glib.h>
+ #include <dbus/dbus-glib-lowlevel.h>
+ 
diff --git a/sysutils/hal/patches/patch-hald_linux_addons_addon-leds.c b/sysutils/hal/patches/patch-hald_linux_addons_addon-leds.c
new file mode 100644
index 00000000000..40fbb3a3f1a
--- /dev/null
+++ b/sysutils/hal/patches/patch-hald_linux_addons_addon-leds.c
@@ -0,0 +1,13 @@
+$NetBSD: patch-hald_linux_addons_addon-leds.c,v 1.1 2012/05/14 03:12:01 sbd Exp $
+
+--- hald/linux/addons/addon-leds.c.orig	2009-08-24 12:42:30.000000000 +0000
++++ hald/linux/addons/addon-leds.c
+@@ -36,8 +36,6 @@
+ #include <unistd.h> 
+ 
+ #include <glib.h>
+-#include <glib/gmain.h>
+-#include <glib/gstdio.h>
+ #include <dbus/dbus-glib.h>
+ #include <dbus/dbus-glib-lowlevel.h>
+ 
diff --git a/sysutils/hal/patches/patch-hald_linux_addons_addon-macbookpro-backlight.c b/sysutils/hal/patches/patch-hald_linux_addons_addon-macbookpro-backlight.c
new file mode 100644
index 00000000000..0ad4e0bf11a
--- /dev/null
+++ b/sysutils/hal/patches/patch-hald_linux_addons_addon-macbookpro-backlight.c
@@ -0,0 +1,13 @@
+$NetBSD: patch-hald_linux_addons_addon-macbookpro-backlight.c,v 1.1 2012/05/14 03:12:01 sbd Exp $
+
+--- hald/linux/addons/addon-macbookpro-backlight.c.orig	2009-08-24 12:42:30.000000000 +0000
++++ hald/linux/addons/addon-macbookpro-backlight.c
+@@ -39,7 +39,7 @@
+ #include <pci/pci.h>
+ #include <unistd.h> 
+ 
+-#include <glib/gmain.h>
++#include <glib.h>
+ #include <dbus/dbus-glib.h>
+ #include <dbus/dbus-glib-lowlevel.h>
+ 
diff --git a/sysutils/hal/patches/patch-hald_linux_addons_addon-omap-backlight.c b/sysutils/hal/patches/patch-hald_linux_addons_addon-omap-backlight.c
new file mode 100644
index 00000000000..95971a188e5
--- /dev/null
+++ b/sysutils/hal/patches/patch-hald_linux_addons_addon-omap-backlight.c
@@ -0,0 +1,13 @@
+$NetBSD: patch-hald_linux_addons_addon-omap-backlight.c,v 1.1 2012/05/14 03:12:01 sbd Exp $
+
+--- hald/linux/addons/addon-omap-backlight.c.orig	2009-08-24 12:42:30.000000000 +0000
++++ hald/linux/addons/addon-omap-backlight.c
+@@ -41,7 +41,7 @@
+ #include <fcntl.h>
+ #include <unistd.h> 
+ 
+-#include <glib/gmain.h>
++#include <glib.h>
+ #include <dbus/dbus-glib.h>
+ #include <dbus/dbus-glib-lowlevel.h>
+ 
diff --git a/sysutils/hal/patches/patch-hald_linux_addons_addon-rfkill-killswitch.c b/sysutils/hal/patches/patch-hald_linux_addons_addon-rfkill-killswitch.c
new file mode 100644
index 00000000000..9eda5cbad76
--- /dev/null
+++ b/sysutils/hal/patches/patch-hald_linux_addons_addon-rfkill-killswitch.c
@@ -0,0 +1,13 @@
+$NetBSD: patch-hald_linux_addons_addon-rfkill-killswitch.c,v 1.1 2012/05/14 03:12:01 sbd Exp $
+
+--- hald/linux/addons/addon-rfkill-killswitch.c.orig	2009-08-24 12:42:30.000000000 +0000
++++ hald/linux/addons/addon-rfkill-killswitch.c
+@@ -36,8 +36,6 @@
+ #include <unistd.h> 
+ 
+ #include <glib.h>
+-#include <glib/gmain.h>
+-#include <glib/gstdio.h>
+ #include <dbus/dbus-glib.h>
+ #include <dbus/dbus-glib-lowlevel.h>
+ 
diff --git a/sysutils/hal/patches/patch-hald_linux_addons_addon-storage.c b/sysutils/hal/patches/patch-hald_linux_addons_addon-storage.c
new file mode 100644
index 00000000000..c6a82688148
--- /dev/null
+++ b/sysutils/hal/patches/patch-hald_linux_addons_addon-storage.c
@@ -0,0 +1,13 @@
+$NetBSD: patch-hald_linux_addons_addon-storage.c,v 1.1 2012/05/14 03:12:01 sbd Exp $
+
+--- hald/linux/addons/addon-storage.c.orig	2009-08-24 12:42:30.000000000 +0000
++++ hald/linux/addons/addon-storage.c
+@@ -39,7 +39,7 @@
+ #include <string.h>
+ #include <sys/ioctl.h>
+ #include <unistd.h>
+-#include <glib/gmain.h>
++#include <glib.h>
+ #include <dbus/dbus-glib.h>
+ #include <dbus/dbus-glib-lowlevel.h>
+ 
diff --git a/sysutils/hal/patches/patch-hald_linux_addons_addon-usb-csr.c b/sysutils/hal/patches/patch-hald_linux_addons_addon-usb-csr.c
new file mode 100644
index 00000000000..87ae4c54427
--- /dev/null
+++ b/sysutils/hal/patches/patch-hald_linux_addons_addon-usb-csr.c
@@ -0,0 +1,13 @@
+$NetBSD: patch-hald_linux_addons_addon-usb-csr.c,v 1.1 2012/05/14 03:12:01 sbd Exp $
+
+--- hald/linux/addons/addon-usb-csr.c.orig	2009-08-24 12:42:30.000000000 +0000
++++ hald/linux/addons/addon-usb-csr.c
+@@ -29,7 +29,7 @@
+ #include <string.h>
+ #include <usb.h>
+ 
+-#include <glib/gmain.h>
++#include <glib.h>
+ #include <dbus/dbus-glib.h>
+ #include <dbus/dbus-glib-lowlevel.h>
+