svn commit: r452531 - in head/sysutils/nut: . files

[Cy Schubert]

Author: cy
Date: Fri Oct 20 14:51:35 2017
New Revision: 452531
URL: https://svnweb.freebsd.org/changeset/ports/452531

Log:
  Fix build with SERIAL option.
  
  PR:		223122

Modified:
  head/sysutils/nut/Makefile   (contents, props changed)
  head/sysutils/nut/files/patch-drivers_libshut.c   (contents, props changed)
  head/sysutils/nut/files/patch-drivers_usbhid-ups.c   (contents, props changed)

Modified: head/sysutils/nut/Makefile
==============================================================================
--- head/sysutils/nut/Makefile	Fri Oct 20 14:50:02 2017	(r452530)
+++ head/sysutils/nut/Makefile	Fri Oct 20 14:51:35 2017	(r452531)
@@ -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

Modified: head/sysutils/nut/files/patch-drivers_libshut.c
==============================================================================
--- head/sysutils/nut/files/patch-drivers_libshut.c	Fri Oct 20 14:50:02 2017	(r452530)
+++ head/sysutils/nut/files/patch-drivers_libshut.c	Fri Oct 20 14:51:35 2017	(r452531)
@@ -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)

Modified: head/sysutils/nut/files/patch-drivers_usbhid-ups.c
==============================================================================
--- head/sysutils/nut/files/patch-drivers_usbhid-ups.c	Fri Oct 20 14:50:02 2017	(r452530)
+++ head/sysutils/nut/files/patch-drivers_usbhid-ups.c	Fri Oct 20 14:51:35 2017	(r452531)
@@ -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) {