diff options
| author | Cy Schubert <cy@FreeBSD.org> | 2017-10-20 14:51:35 +0000 |
|---|---|---|
| committer | Cy Schubert <cy@FreeBSD.org> | 2017-10-20 14:51:35 +0000 |
| commit | 637c5b1c84e2a2b395cadbf1358a69c654fe48c1 (patch) | |
| tree | 9e0e9b021e87479cdc3b8baf2fcd1ab05f7a482a /sysutils/nut | |
| parent | 3dfa82cd8654461d27961a92e5b439e796d24bf3 (diff) | |
| download | ports-637c5b1c84e2a2b395cadbf1358a69c654fe48c1.tar.gz ports-637c5b1c84e2a2b395cadbf1358a69c654fe48c1.zip | |
Fix build with SERIAL option.
PR: 223122
Notes
Notes:
svn path=/head/; revision=452531
Diffstat (limited to 'sysutils/nut')
| -rw-r--r-- | sysutils/nut/Makefile | 2 | ||||
| -rw-r--r-- | sysutils/nut/files/patch-drivers_libshut.c | 10 | ||||
| -rw-r--r-- | sysutils/nut/files/patch-drivers_usbhid-ups.c | 8 |
3 files changed, 18 insertions, 2 deletions
diff --git a/sysutils/nut/Makefile b/sysutils/nut/Makefile index a10c3ffa5e7e..416bbce8788b 100644 --- a/sysutils/nut/Makefile +++ b/sysutils/nut/Makefile @@ -3,7 +3,7 @@ PORTNAME= nut PORTVERSION= 2.7.4 -PORTREVISION= 5 +PORTREVISION= 6 CATEGORIES= sysutils MASTER_SITES= http://www.networkupstools.org/source/${PORTVERSION:R}/ DISTFILES= ${DISTNAME}${EXTRACT_SUFX} ${DISTNAME}${EXTRACT_SUFX}.sig diff --git a/sysutils/nut/files/patch-drivers_libshut.c b/sysutils/nut/files/patch-drivers_libshut.c index c4a1895398d2..b925c8948250 100644 --- a/sysutils/nut/files/patch-drivers_libshut.c +++ b/sysutils/nut/files/patch-drivers_libshut.c @@ -1,6 +1,14 @@ --- drivers/libshut.c.orig 2015-12-29 12:08:34 UTC +++ drivers/libshut.c -@@ -809,10 +809,10 @@ int shut_get_string_simple(int upsfd, int index, +@@ -37,6 +37,7 @@ + #include "nut_stdint.h" /* for uint8_t, uint16_t, uint32_t */ + + #include "serial.h" ++#include "libusb.h" + #include "libshut.h" + #include "common.h" /* for xmalloc, upsdebugx prototypes */ + +@@ -809,10 +810,10 @@ int shut_get_string_simple(int upsfd, int index, return ret; if (tbuf[1] != USB_DT_STRING) diff --git a/sysutils/nut/files/patch-drivers_usbhid-ups.c b/sysutils/nut/files/patch-drivers_usbhid-ups.c index 02ff0956a7a8..620b60c0baf1 100644 --- a/sysutils/nut/files/patch-drivers_usbhid-ups.c +++ b/sysutils/nut/files/patch-drivers_usbhid-ups.c @@ -1,5 +1,13 @@ --- drivers/usbhid-ups.c.orig 2015-12-29 12:08:34 UTC +++ drivers/usbhid-ups.c +@@ -30,6 +30,7 @@ + #define DRIVER_VERSION "0.41" + + #include "main.h" ++#include "libusb.h" + #include "libhid.h" + #include "usbhid-ups.h" + #include "hidparser.h" @@ -790,22 +790,14 @@ void upsdrv_updateinfo(void) /* Get HID notifications on Interrupt pipe first */ if (use_interrupt_pipe == TRUE) { |