HAL compiles on Gentoo/FreeBSD

Package-Manager: portage-2.1.2.3

diff --git a/sys-apps/hal/ChangeLog b/sys-apps/hal/ChangeLog
index 4cf374c5a4fc5a08f3bbb084adf429a13ecc7986..69961e9c553b584c995ca481057db56b6fa9412d 100644 (file)
--- a/sys-apps/hal/ChangeLog
+++ b/sys-apps/hal/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for sys-apps/hal
 # Copyright 1999-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/hal/ChangeLog,v 1.161 2007/04/11 23:39:56 cardoe Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/hal/ChangeLog,v 1.162 2007/04/12 16:13:00 cardoe Exp $
+
+  12 Apr 2007; Doug Goldstein <cardoe@gentoo.org>
+  files/0.5.9/05_freebsd_partutil_make_fix.patch,
+  files/0.5.9/06_freebsd_backend_fix.patch, hal-0.5.9.ebuild:
+  HAL compiles on Gentoo/FreeBSD
 
   11 Apr 2007; Doug Goldstein <cardoe@gentoo.org>
   files/0.5.9/06_freebsd_backend_fix.patch:

diff --git a/sys-apps/hal/Manifest b/sys-apps/hal/Manifest
index 167efbd62e0bdd14cf85351328353daa1734b7e6..b80319b7c00b8208351b23cd073b3247ce085f80 100644 (file)
--- a/sys-apps/hal/Manifest
+++ b/sys-apps/hal/Manifest
@@ -29,14 +29,14 @@ AUX 0.5.9/04_cache_regen_return_fix.patch 740 RMD160 119c4d4714765917b8d8bc62266
 MD5 bbb1872eb4a7d94e028cb3ba9c440bfe files/0.5.9/04_cache_regen_return_fix.patch 740
 RMD160 119c4d4714765917b8d8bc622663ee19e7a3ffd2 files/0.5.9/04_cache_regen_return_fix.patch 740
 SHA256 7deab9fcc6e1063062460e88b7d931e641b8d878b644f9e4ed53d50cdfcdfbd7 files/0.5.9/04_cache_regen_return_fix.patch 740
-AUX 0.5.9/05_freebsd_partutil_make_fix.patch 579 RMD160 96035d38334a9ac18e16014d11820c56823425e9 SHA1 c78f0416908b547962ed6a4b67851bf18c2706d7 SHA256 4f8d912bc84084d85a626003f93835fb6d92e0bf1aa9d09d282b47182c57966e
-MD5 74d899e87a335a963a6aa5240ebc771a files/0.5.9/05_freebsd_partutil_make_fix.patch 579
-RMD160 96035d38334a9ac18e16014d11820c56823425e9 files/0.5.9/05_freebsd_partutil_make_fix.patch 579
-SHA256 4f8d912bc84084d85a626003f93835fb6d92e0bf1aa9d09d282b47182c57966e files/0.5.9/05_freebsd_partutil_make_fix.patch 579
-AUX 0.5.9/06_freebsd_backend_fix.patch 2654 RMD160 7da55bc415914bf1b5235ce687592f70ab72a415 SHA1 5438de20ed2d5041087f600dd089f2843ad7fc98 SHA256 925aec0dfa60af59c33f0b49b6ca2e559b40fadf51003eb8e31efbe6b59402b3
-MD5 d6e07b0b7fc434fdc1624ec88d1cd68e files/0.5.9/06_freebsd_backend_fix.patch 2654
-RMD160 7da55bc415914bf1b5235ce687592f70ab72a415 files/0.5.9/06_freebsd_backend_fix.patch 2654
-SHA256 925aec0dfa60af59c33f0b49b6ca2e559b40fadf51003eb8e31efbe6b59402b3 files/0.5.9/06_freebsd_backend_fix.patch 2654
+AUX 0.5.9/05_freebsd_partutil_make_fix.patch 622 RMD160 a98ba0f5bc6a57a5534752f17146810e72c1417d SHA1 79a7ae8f660658b67626b33613afe5aea092032c SHA256 f514491ccb2152938cf0fea2ee316a37700e6f4b953421e16e047ee1a3f0a181
+MD5 7c083c72c2122502ff9c740f537249ad files/0.5.9/05_freebsd_partutil_make_fix.patch 622
+RMD160 a98ba0f5bc6a57a5534752f17146810e72c1417d files/0.5.9/05_freebsd_partutil_make_fix.patch 622
+SHA256 f514491ccb2152938cf0fea2ee316a37700e6f4b953421e16e047ee1a3f0a181 files/0.5.9/05_freebsd_partutil_make_fix.patch 622
+AUX 0.5.9/06_freebsd_backend_fix.patch 2553 RMD160 f1e62b12ebc7f89a29bef0f63c7befea22bcbb80 SHA1 11008f69eb2a7a0d3423fe604d035c20fdbb43ff SHA256 9e1ad1d1822853c042c768e6aab76de887add189bec68539b53c9f36eff258be
+MD5 61cdcbf0bff71818480f385b764e7b40 files/0.5.9/06_freebsd_backend_fix.patch 2553
+RMD160 f1e62b12ebc7f89a29bef0f63c7befea22bcbb80 files/0.5.9/06_freebsd_backend_fix.patch 2553
+SHA256 9e1ad1d1822853c042c768e6aab76de887add189bec68539b53c9f36eff258be files/0.5.9/06_freebsd_backend_fix.patch 2553
 AUX 0.5.9/07_malloc_h_for_stdlib_h.patch 1401 RMD160 2e1140954fd8818d412fc07750f12b25d04f7ada SHA1 8fc34e0f1a81e89465ffbce7881aba597276121f SHA256 04749b15f3349e146523d9ed2571e5362804de5f0320f68cbcc85395debc6554
 MD5 61d44f37a51f2e92054bda4df0b67688 files/0.5.9/07_malloc_h_for_stdlib_h.patch 1401
 RMD160 2e1140954fd8818d412fc07750f12b25d04f7ada files/0.5.9/07_malloc_h_for_stdlib_h.patch 1401
@@ -167,14 +167,14 @@ EBUILD hal-0.5.7.1-r5.ebuild 6426 RMD160 ba28bce7126639c77de28ac2fc8d233475bb498
 MD5 709ca20b11819f2e13e381be47e19535 hal-0.5.7.1-r5.ebuild 6426
 RMD160 ba28bce7126639c77de28ac2fc8d233475bb498e hal-0.5.7.1-r5.ebuild 6426
 SHA256 6e020d3a29d82b993984f58ab8ef3659d837c11bce25f3ad25df6f4748e11207 hal-0.5.7.1-r5.ebuild 6426
-EBUILD hal-0.5.9.ebuild 6383 RMD160 3777975a916ff2e04f2ffc4c97ad2e1f2e1b6de1 SHA1 7be9f45930f7adec9278ce92489d0fec565d4859 SHA256 1734a1121bb33064e8bedadee3682947e654244b381d0032c3a28beed87c2a60
-MD5 84c3c9a869e9c860b756e033458509da hal-0.5.9.ebuild 6383
-RMD160 3777975a916ff2e04f2ffc4c97ad2e1f2e1b6de1 hal-0.5.9.ebuild 6383
-SHA256 1734a1121bb33064e8bedadee3682947e654244b381d0032c3a28beed87c2a60 hal-0.5.9.ebuild 6383
-MISC ChangeLog 25817 RMD160 28a6e401b1eb2bed891601dbda4d61a49d63c0f7 SHA1 31c658d267123618ae0caece9e7af48aca3d0070 SHA256 47b854e4b6a31ae98acfaa100b0683ec3b05acb5d8151b48009bdcc6623c9989
-MD5 176f9b5f92f2ec1a7300fe89f2791485 ChangeLog 25817
-RMD160 28a6e401b1eb2bed891601dbda4d61a49d63c0f7 ChangeLog 25817
-SHA256 47b854e4b6a31ae98acfaa100b0683ec3b05acb5d8151b48009bdcc6623c9989 ChangeLog 25817
+EBUILD hal-0.5.9.ebuild 6397 RMD160 d71434cb5612aef6549b0795433c472d7e39d559 SHA1 77d79b0d30dbf13fbcf8ac6fe59dea0901b4195f SHA256 884ba549e9dceae7d7c702403f4ae53722741c6ccd0234f7362eb683ccee8563
+MD5 5d94a21cd2d6ea32f164ca10814ff5f0 hal-0.5.9.ebuild 6397
+RMD160 d71434cb5612aef6549b0795433c472d7e39d559 hal-0.5.9.ebuild 6397
+SHA256 884ba549e9dceae7d7c702403f4ae53722741c6ccd0234f7362eb683ccee8563 hal-0.5.9.ebuild 6397
+MISC ChangeLog 26013 RMD160 1c1d1cd06832aaf1320b77e90c238c8bf8d4beec SHA1 bad11c5add1669ecd6b9ef9994adcfde0f6c603b SHA256 4523b46c9cbbbd42b478a71861db5ed3f21138c7ad2f61a16258144c17091f58
+MD5 824b1687b71c2d2cbd10506968fceecb ChangeLog 26013
+RMD160 1c1d1cd06832aaf1320b77e90c238c8bf8d4beec ChangeLog 26013
+SHA256 4523b46c9cbbbd42b478a71861db5ed3f21138c7ad2f61a16258144c17091f58 ChangeLog 26013
 MISC metadata.xml 345 RMD160 aa6e810e9546542453ebe5d6ca46804e99f447f2 SHA1 fef829210e8555807f9b69ba5afedffb8af8d02c SHA256 0c9aeabf473a6836c25a5db2ca86b880dec1efa9e52310725e08d1e0df93447d
 MD5 3317c4000387b670183d305ef9937b75 metadata.xml 345
 RMD160 aa6e810e9546542453ebe5d6ca46804e99f447f2 metadata.xml 345
@@ -191,7 +191,7 @@ SHA256 d862b002c9a5547954874b2a0cbadd614381d085e850539e6aef2dd9e9d52dfe files/di
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.3 (GNU/Linux)
 
-iD8DBQFGHXG/oeSe8B0zEfwRAv6cAJ4pohadEAhemGQJSgLQDDxP/VrXJACeIJrg
-XtnvhAifjNbXDqYhORdRgJA=
-=ziGz
+iD4DBQFGHlq9oeSe8B0zEfwRAm/gAKCC+yxvaJEokNNWw30EUKua3dknPACYwUEj
+R2AxUVh3CGdz3Dx+iPDLdw==
+=IHGX
 -----END PGP SIGNATURE-----

diff --git a/sys-apps/hal/files/0.5.9/05_freebsd_partutil_make_fix.patch b/sys-apps/hal/files/0.5.9/05_freebsd_partutil_make_fix.patch
index a3f5a7eee6c43655cbacad5e466bfce2e0d2c770..6fd63e119f66a7cba8b2bd9d50909dc9367c1b8e 100644 (file)
--- a/sys-apps/hal/files/0.5.9/05_freebsd_partutil_make_fix.patch
+++ b/sys-apps/hal/files/0.5.9/05_freebsd_partutil_make_fix.patch
@@ -1,8 +1,8 @@
 Index: b/partutil/Makefile.am
 ===================================================================
 --- a/partutil/Makefile.am     2007-04-11 15:50:44.000000000 -0400
-+++ b/partutil/Makefile.am     2007-04-11 15:51:14.000000000 -0400
-@@ -1,13 +1,8 @@
++++ b/partutil/Makefile.am     2007-04-12 11:42:23.000000000 -0400
+@@ -1,17 +1,12 @@
 -if HALD_COMPILE_SOLARIS 
 -# do nothing
 -else if HALD_COMPILE_FREEBSD
@@ -10,6 +10,7 @@ Index: b/partutil/Makefile.am
 -else 
 +if HALD_COMPILE_LINUX
 +noinst_LTLIBRARIES = libpartutil.la
++endif
  
  INCLUDES = @GLIB_CFLAGS@
  
@@ -18,3 +19,7 @@ Index: b/partutil/Makefile.am
  libpartutil_la_SOURCES = partutil.h partutil.c ../hald/logger.c
  
  libpartutil_la_LIBADD = @GLIB_LIBS@ @PARTED_LIBS@
+ 
+ clean-local :
+       rm -f *~
+-endif

diff --git a/sys-apps/hal/files/0.5.9/06_freebsd_backend_fix.patch b/sys-apps/hal/files/0.5.9/06_freebsd_backend_fix.patch
index 95125ac9081afa9365d1567d0b3d87cb2a217900..d18c03212673ef97748e5a85776b48aac0e959cc 100644 (file)
--- a/sys-apps/hal/files/0.5.9/06_freebsd_backend_fix.patch
+++ b/sys-apps/hal/files/0.5.9/06_freebsd_backend_fix.patch
@@ -1,7 +1,7 @@
 Index: b/hald/freebsd/hf-usb.c
 ===================================================================
---- a/hald/freebsd/hf-usb.c    2007-04-11 15:50:44.000000000 -0400
-+++ b/hald/freebsd/hf-usb.c    2007-04-11 19:19:07.000000000 -0400
+--- a/hald/freebsd/hf-usb.c    2007-04-12 11:42:05.000000000 -0400
++++ b/hald/freebsd/hf-usb.c    2007-04-12 11:59:40.000000000 -0400
 @@ -372,11 +372,11 @@
        can_wake_up = (config_desc.bmAttributes & UC_REMOTE_WAKEUP) != 0;
        num_interfaces = config_desc.bNumInterface;
@@ -36,31 +36,32 @@ Index: b/hald/freebsd/hf-usb.c
          p += USB_INTERFACE_DESCRIPTOR_SIZE + if_desc->bNumEndpoints * USB_ENDPOINT_DESCRIPTOR_SIZE;
 Index: b/hald/freebsd/hf-pci.c
 ===================================================================
---- a/hald/freebsd/hf-pci.c    2007-04-11 14:55:43.000000000 -0400
-+++ b/hald/freebsd/hf-pci.c    2007-04-11 19:32:33.000000000 -0400
-@@ -207,12 +207,22 @@
-       for (p = conf; p < &conf[pc.num_matches]; p++)
-         {
-           DeviceInfo *info;
-+        HalProperty *pcibus, *pcidevice, *pcifunc;
-+
-+        pcibus = hal_property_new(HAL_PROPERTY_TYPE_INT32);
-+        hal_property_set_int(pcibus, p->pc_sel.pc_bus);
-+
-+        pcidevice = hal_property_new(HAL_PROPERTY_TYPE_INT32);
-+        hal_property_set_int(pcidevice, p->pc_sel.pc_dev);
-+
-+        pcifunc = hal_property_new(HAL_PROPERTY_TYPE_INT32);
-+        hal_property_set_int(pcifunc, p->pc_sel.pc_func);
+--- a/hald/freebsd/hf-pci.c    2007-04-12 11:42:05.000000000 -0400
++++ b/hald/freebsd/hf-pci.c    2007-04-12 12:04:48.000000000 -0400
+@@ -38,6 +38,7 @@
+ 
+ #include "../hald.h"
+ #include "../ids.h"
++#include "../device.h"
+ #include "../logger.h"
+ #include "../util.h"
+ 
+@@ -210,9 +211,15 @@
  
          info = g_new(DeviceInfo, 1);
          info->device = hf_device_store_match(hald_get_gdl(),
 -                                             hal_property_new_int("pci.freebsd.bus", p->pc_sel.pc_bus),
 -                                             hal_property_new_int("pci.freebsd.device", p->pc_sel.pc_dev),
 -                                             hal_property_new_int("pci.freebsd.function", p->pc_sel.pc_func),
-+                                             pcibus,
-+                                             pcidevice,
-+                                             pcifunc,
++                                             "pci.freebsd.bus",
++                                             HAL_PROPERTY_TYPE_INT32,
++                                             p->pc_sel.pc_bus,
++                                             "pci.freebsd.device",
++                                             HAL_PROPERTY_TYPE_INT32,
++                                             p->pc_sel.pc_dev,
++                                             "pci.freebsd.function",
++                                             HAL_PROPERTY_TYPE_INT32,
++                                             p->pc_sel.pc_func,
                                               NULL);
          info->p = *p;
          info->secondary_bus = hf_pci_get_register(p, PCIR_SECBUS_1);

diff --git a/sys-apps/hal/hal-0.5.9.ebuild b/sys-apps/hal/hal-0.5.9.ebuild
index ec43c42a14a50148294ebcae6b7af44c976ebfec..1605606258964f9712e3e539bb32a0e5ecafec07 100644 (file)
--- a/sys-apps/hal/hal-0.5.9.ebuild
+++ b/sys-apps/hal/hal-0.5.9.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2007 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/hal/hal-0.5.9.ebuild,v 1.16 2007/04/11 16:12:42 cardoe Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/hal/hal-0.5.9.ebuild,v 1.17 2007/04/12 16:13:00 cardoe Exp $
 
 inherit eutils linux-info autotools flag-o-matic
 
@@ -105,6 +105,8 @@ src_unpack() {
 
        # Gentoo Patch Set
        EPATCH_SUFFIX="patch" EPATCH_FORCE="yes" epatch ${FILESDIR}/${PV}
+
+       eautoreconf
 }
 
 src_compile() {