diff options
| author | Hajimu UMEMOTO <ume@FreeBSD.org> | 2015-04-29 19:32:46 +0000 |
|---|---|---|
| committer | Hajimu UMEMOTO <ume@FreeBSD.org> | 2015-04-29 19:32:46 +0000 |
| commit | a56133d45f422df06f05e976ab8502a9f491d9b5 (patch) | |
| tree | 2d929533d1123e3c5876546609c9cc2284ea2ab5 /sysutils/gkrellm2 | |
| parent | a1d178dc33fca583358679090ae473a77e34224b (diff) | |
| download | ports-a56133d45f422df06f05e976ab8502a9f491d9b5.tar.gz ports-a56133d45f422df06f05e976ab8502a9f491d9b5.zip | |
- Try to fix build after SMBus change (r281985). [1]
- Rename patch.
Spotted by: pkg-fallout [1]
Notes
Notes:
svn path=/head/; revision=385008
Diffstat (limited to 'sysutils/gkrellm2')
| -rw-r--r-- | sysutils/gkrellm2/files/patch-src__Makefile (renamed from sysutils/gkrellm2/files/patch-src:Makefile) | 0 | ||||
| -rw-r--r-- | sysutils/gkrellm2/files/patch-src__sysdeps__freebsd.c | 24 |
2 files changed, 24 insertions, 0 deletions
diff --git a/sysutils/gkrellm2/files/patch-src:Makefile b/sysutils/gkrellm2/files/patch-src__Makefile index 22b834aa69b8..22b834aa69b8 100644 --- a/sysutils/gkrellm2/files/patch-src:Makefile +++ b/sysutils/gkrellm2/files/patch-src__Makefile diff --git a/sysutils/gkrellm2/files/patch-src__sysdeps__freebsd.c b/sysutils/gkrellm2/files/patch-src__sysdeps__freebsd.c new file mode 100644 index 000000000000..5098c255ac51 --- /dev/null +++ b/sysutils/gkrellm2/files/patch-src__sysdeps__freebsd.c @@ -0,0 +1,24 @@ +Index: src/sysdeps/freebsd.c +diff -u -p src/sysdeps/freebsd.c.orig src/sysdeps/freebsd.c +--- src/sysdeps/freebsd.c.orig 2010-10-07 23:29:35.000000000 +0900 ++++ src/sysdeps/freebsd.c 2015-04-30 04:11:17.549088591 +0900 +@@ -1441,7 +1441,9 @@ get_data(int iodev, u_char command, int + struct smbcmd cmd; + + bzero(&cmd, sizeof(cmd)); ++#if __FreeBSD_version < 1100070 + cmd.data.byte_ptr = (char *)&byte; ++#endif + cmd.slave = 0x5a; + cmd.cmd = command; + if (ioctl(iodev, SMB_READB, (caddr_t)&cmd) == -1) +@@ -1449,6 +1451,9 @@ get_data(int iodev, u_char command, int + close(iodev); + return FALSE; + } ++#if __FreeBSD_version >= 1100070 ++ byte = (u_char)cmd.rdata.byte ++#endif + } + #endif + else |