diff options
| author | Joe Marcus Clarke <marcus@FreeBSD.org> | 2008-04-02 18:37:15 +0000 |
|---|---|---|
| committer | Joe Marcus Clarke <marcus@FreeBSD.org> | 2008-04-02 18:37:15 +0000 |
| commit | 76eb6eac5a9da7a27dc2da3991a4b50f130d8f20 (patch) | |
| tree | 1d4efa7cd49354c98a69f32357b3f0db679961a8 | |
| parent | Don't install fragments of Compress/Zlib and JSON. They conflict with (diff) | |
Fix the build on 5.X.
Reported by: Taylor Mallette <taylor@supermilo.com>
| -rw-r--r-- | sysutils/hal/files/patch-hald_freebsd_clock | 11 |
1 files changed, 7 insertions, 4 deletions
diff --git a/sysutils/hal/files/patch-hald_freebsd_clock b/sysutils/hal/files/patch-hald_freebsd_clock index 5ce33fde67e2..488283e02e36 100644 --- a/sysutils/hal/files/patch-hald_freebsd_clock +++ b/sysutils/hal/files/patch-hald_freebsd_clock @@ -75,18 +75,21 @@ + hfp_timespecfix(t1); } --- hald/freebsd/libprobe/hfp.h.orig 2008-03-17 17:25:17.000000000 -0400 -+++ hald/freebsd/libprobe/hfp.h 2008-03-26 12:05:36.000000000 -0400 -@@ -29,8 +29,8 @@ ++++ hald/freebsd/libprobe/hfp.h 2008-04-02 14:35:50.000000000 -0400 +@@ -29,8 +29,12 @@ #endif #include <stdarg.h> +#include <time.h> #include <sys/types.h> --#include <sys/time.h> ++#include <sys/param.h> ++#if __FreeBSD_version < 600000 + #include <sys/time.h> ++#endif #include "libhal/libhal.h" -@@ -84,14 +84,14 @@ void volume_id_log (const char *format, +@@ -84,14 +88,14 @@ void volume_id_log (const char *format, boolean hfp_getenv_bool (const char *variable); |