Hal 0.5.14nb6 pkgsrc Fixes for Linux

[Ole Andre Rodlie <olear%dracolinux.org@localhost>]

Hi, found several bugs when trying to build HAL today (on Linux). Mostly 
glib stuff.

Bulk reports with build errors for each patch applied:

http://pkgstat.dracolinux.org/20120510.1746/sysutils/hal/.broken.html
http://pkgstat.dracolinux.org/20120510.1850/sysutils/hal/.broken.html
http://pkgstat.dracolinux.org/20120510.1907/sysutils/hal/.broken.html
http://pkgstat.dracolinux.org/20120510.1923/sysutils/hal/.broken.html
http://pkgstat.dracolinux.org/20120510.1933/sysutils/hal/.broken.html
http://pkgstat.dracolinux.org/20120510.1942/sysutils/hal/.broken.html
http://pkgstat.dracolinux.org/20120510.2008/sysutils/hal/.broken.html
http://pkgstat.dracolinux.org/20120510.2016/sysutils/hal/.broken.html
http://pkgstat.dracolinux.org/20120510.2024/sysutils/hal/.broken.html

Kind Regards

Ole Andre Rodlie
olear%dracolinux.org@localhost

hal-0.5.14nb6_to_0.5.14nb7.diff:

diff -burN sysutils/hal.orig/Makefile sysutils/hal/Makefile
--- sysutils/hal.orig/Makefile    2012-03-31 18:06:56.000000000 +0200
+++ sysutils/hal/Makefile    2012-05-10 20:49:03.528465145 +0200
@@ -1,7 +1,7 @@
 # $NetBSD: Makefile,v 1.60 2012/03/31 16:06:56 ryoon Exp $

 DISTNAME=        hal-0.5.14
-PKGREVISION=        6
+PKGREVISION=        7
 CATEGORIES=        sysutils
 MASTER_SITES=        http://hal.freedesktop.org/releases/
 EXTRACT_SUFX=        .tar.bz2
diff -burN sysutils/hal.orig/PLIST.Linux sysutils/hal/PLIST.Linux
--- sysutils/hal.orig/PLIST.Linux    2011-01-09 02:26:56.000000000 +0100
+++ sysutils/hal/PLIST.Linux    2012-05-10 20:49:03.532634034 +0200
@@ -9,6 +9,8 @@
 libexec/hald-addon-input
 libexec/hald-addon-ipw-killswitch
 libexec/hald-addon-leds
+libexec/hald-addon-macbook-backlight
+libexec/hald-addon-macbookpro-backlight
 libexec/hald-addon-rfkill-killswitch
 libexec/hald-addon-storage
 libexec/hald-probe-hiddev
@@ -43,4 +45,6 @@
 share/examples/hal/90-hal.rules
 share/hal/fdi/policy/10osvendor/10-cpufreq.fdi
 share/hal/fdi/policy/10osvendor/10-imac-backlight.fdi
+share/hal/fdi/policy/10osvendor/10-macbook-backlight.fdi
+share/hal/fdi/policy/10osvendor/10-macbookpro-utils.fdi
 share/hal/fdi/policy/10osvendor/10-keymap.fdi
diff -burN sysutils/hal.orig/distinfo sysutils/hal/distinfo
--- sysutils/hal.orig/distinfo    2012-03-31 18:06:56.000000000 +0200
+++ sysutils/hal/distinfo    2012-05-10 20:49:03.537460729 +0200
@@ -35,3 +35,11 @@
 SHA1 (patch-nb) = 1693b7a2faa5bee20a594f0b60b8ff6caea0efdc
 SHA1 (patch-nc) = 32453e49734902749ce24eb4364fc7f531986227
 SHA1 (patch-nd) = 877dcbafaca0cebd3fdce74c5a622721823c153b
+SHA1 (patch-ne) = 40877ec8575432db990cfc03563e662b239f02a5
+SHA1 (patch-nf) = 0197080d164af7bbb6c776593650a37195a53cd4
+SHA1 (patch-ng) = ca1548f05d80775fadf4c2f16bb9d9bf1b806501
+SHA1 (patch-nh) = ca328ee01a8d22f6576768ebf0feca4c547f5f76
+SHA1 (patch-ni) = 4839731c1fdfc1a2b7c8ef5cc6ad8c1952b0e0e5
+SHA1 (patch-nl) = fa528e074d55aa549b05d1cceb551632ab341d3f
+SHA1 (patch-nm) = e7f7e78a163eee47a233a9597627923953fe686b
+SHA1 (patch-nn) = c8a4ae166787ea22246268114cd5c276f25480cb
diff -burN sysutils/hal.orig/patches/patch-ne sysutils/hal/patches/patch-ne
--- sysutils/hal.orig/patches/patch-ne    1970-01-01 01:00:00.000000000 
+0100
+++ sysutils/hal/patches/patch-ne    2012-05-10 20:49:24.980442118 +0200
@@ -0,0 +1,11 @@
+--- hald/linux/addons/addon-generic-backlight.c.orig    2012-05-10 
18:41:58.835647175 +0200
++++ hald/linux/addons/addon-generic-backlight.c    2012-05-10 
18:42:48.699455324 +0200
+@@ -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 -burN sysutils/hal.orig/patches/patch-nf sysutils/hal/patches/patch-nf
--- sysutils/hal.orig/patches/patch-nf    1970-01-01 01:00:00.000000000 
+0100
+++ sysutils/hal/patches/patch-nf    2012-05-10 20:49:24.980442118 +0200
@@ -0,0 +1,11 @@
+--- hald/linux/addons/addon-input.c.orig    2012-05-10 
19:05:26.268503544 +0200
++++ hald/linux/addons/addon-input.c    2012-05-10 19:05:50.602444313 +0200
+@@ -41,7 +41,7 @@
+ #else
+   #include <linux/input.h>
+ #endif
+-#include <glib/gmain.h>
++#include <glib.h>
+ #include <glib/gprintf.h>
+ #include <dbus/dbus-glib-lowlevel.h>
+
diff -burN sysutils/hal.orig/patches/patch-ng sysutils/hal/patches/patch-ng
--- sysutils/hal.orig/patches/patch-ng    1970-01-01 01:00:00.000000000 
+0100
+++ sysutils/hal/patches/patch-ng    2012-05-10 20:49:24.980442118 +0200
@@ -0,0 +1,10 @@
+--- hald/linux/addons/addon-ipw-killswitch.c.orig    2012-05-10 
19:20:39.169603028 +0200
++++ hald/linux/addons/addon-ipw-killswitch.c    2012-05-10 
19:20:52.325412497 +0200
+@@ -36,7 +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 -burN sysutils/hal.orig/patches/patch-nh sysutils/hal/patches/patch-nh
--- sysutils/hal.orig/patches/patch-nh    1970-01-01 01:00:00.000000000 
+0100
+++ sysutils/hal/patches/patch-nh    2012-05-10 20:49:24.980442118 +0200
@@ -0,0 +1,10 @@
+--- hald/linux/addons/addon-leds.c.orig    2012-05-10 
19:32:00.857458133 +0200
++++ hald/linux/addons/addon-leds.c    2012-05-10 19:32:10.667495645 +0200
+@@ -36,7 +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 -burN sysutils/hal.orig/patches/patch-ni sysutils/hal/patches/patch-ni
--- sysutils/hal.orig/patches/patch-ni    1970-01-01 01:00:00.000000000 
+0100
+++ sysutils/hal/patches/patch-ni    2012-05-10 20:49:24.980442118 +0200
@@ -0,0 +1,10 @@
+--- hald/linux/addons/addon-rfkill-killswitch.c.orig    2012-05-10 
19:41:06.672470132 +0200
++++ hald/linux/addons/addon-rfkill-killswitch.c    2012-05-10 
19:41:21.226459783 +0200
+@@ -36,7 +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 -burN sysutils/hal.orig/patches/patch-nl sysutils/hal/patches/patch-nl
--- sysutils/hal.orig/patches/patch-nl    1970-01-01 01:00:00.000000000 
+0100
+++ sysutils/hal/patches/patch-nl    2012-05-10 20:49:24.980442118 +0200
@@ -0,0 +1,11 @@
+--- hald/linux/addons/addon-storage.c.orig    2012-05-10 
19:57:28.486481682 +0200
++++ hald/linux/addons/addon-storage.c    2012-05-10 19:57:49.891485536 
+0200
+@@ -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 -burN sysutils/hal.orig/patches/patch-nm sysutils/hal/patches/patch-nm
--- sysutils/hal.orig/patches/patch-nm    1970-01-01 01:00:00.000000000 
+0100
+++ sysutils/hal/patches/patch-nm    2012-05-10 20:49:24.980442118 +0200
@@ -0,0 +1,11 @@
+--- hald/linux/addons/addon-imac-backlight.c.orig    2012-05-10 
20:15:28.267540981 +0200
++++ hald/linux/addons/addon-imac-backlight.c    2012-05-10 
20:15:39.599507237 +0200
+@@ -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 -burN sysutils/hal.orig/patches/patch-nn sysutils/hal/patches/patch-nn
--- sysutils/hal.orig/patches/patch-nn    1970-01-01 01:00:00.000000000 
+0100
+++ sysutils/hal/patches/patch-nn    2012-05-10 20:49:24.980442118 +0200
@@ -0,0 +1,11 @@
+--- hald/linux/addons/addon-macbookpro-backlight.c.orig    2012-05-10 
20:23:31.011460120 +0200
++++ hald/linux/addons/addon-macbookpro-backlight.c    2012-05-10 
20:23:47.985522675 +0200
+@@ -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>
+