Bug#320962: gnome-applets bug #320962

[Aurelien Jarno]

This time with the patch...

-- 
  .''`.  Aurelien Jarno	            | GPG: 1024D/F1BCDB73
 : :' :  Debian developer           | Electrical Engineer
 `. `'   aurel32 at debian.org         | aurelien at aurel32.net
   `-    people.debian.org/~aurel32 | www.aurel32.net
-------------- next part --------------
--- configure.in
+++ configure.in
@@ -282,7 +282,7 @@
 	   AC_CHECK_LIB(apm,apm_read,[HAVE_LIBAPM=yes],[HAVE_LIBAPM=no])
 	   ;;
        # list of supported OS cores that do not use libapm
-       i386-*-freebsd*|*-*-netbsd*|*-*-openbsd*)
+       i386-*-freebsd*|*-*-netbsd*|*-*-openbsd*|*-*kfreebsd*-gnu)
           if [ -n "${OS_SYS}" ]; then
 	       ACPIINC="-I${OS_SYS}"
 	   else
--- configure
+++ configure
@@ -25588,7 +25588,7 @@
 
 	   ;;
        # list of supported OS cores that do not use libapm
-       i386-*-freebsd*|*-*-netbsd*|*-*-openbsd*)
+       i386-*-freebsd*|*-*-netbsd*|*-*-openbsd*|*-*kfreebsd*-gnu)
           if  -n "${OS_SYS}" ; then
 	       ACPIINC="-I${OS_SYS}"
 	   else
--- battstat/power-management.c
+++ battstat/power-management.c
@@ -171,7 +171,7 @@
 #undef __linux__
 #undef HAVE_HAL
 
-#elif __FreeBSD__
+#elif defined(__FreeBSD__) || defined(__FreeBSD_kernel__)
 
 #include <machine/apm_bios.h>
 #include "acpi-freebsd.h"
@@ -473,7 +473,7 @@
         G_IO_IN | G_IO_ERR | G_IO_HUP,
         acpi_callback, NULL);
   }
-#elif defined(__FreeBSD__)
+#elif defined(__FreeBSD__) || defined(__FreeBSD_kernel__)
   if (acpi_freebsd_init(&acpiinfo)) {
     using_acpi = TRUE;
     acpi_count = 0;
@@ -511,7 +511,7 @@
      acpiwatch = 0;
      acpi_linux_cleanup(&acpiinfo);
   }
-#elif defined(__FreeBSD__)
+#elif defined(__FreeBSD__) || defined(__FreeBSD_kernel__)
   if (using_acpi) {
     acpi_freebsd_cleanup(&acpiinfo);
   }
--- battstat/acpi-freebsd.c
+++ battstat/acpi-freebsd.c
@@ -27,7 +27,7 @@
 #include <config.h>
 #endif
 
-#ifdef __FreeBSD__
+#if defined(__FreeBSD__) || defined(__FreeBSD_kernel__)
 
 #include <stdio.h>
 #include <sys/types.h>
@@ -233,4 +233,4 @@
 
 #endif /* defined(HAVE_ACPIIO) */
 
-#endif /* defined(__FreeBSD__) */
+#endif /* defined(__FreeBSD__) || defined(__FreeBSD_kernel__) */