From owner-svn-ports-head@freebsd.org  Fri Oct 20 14:51:36 2017
Return-Path: <owner-svn-ports-head@freebsd.org>
Delivered-To: svn-ports-head@mailman.ysv.freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org
 [IPv6:2001:1900:2254:206a::19:1])
 by mailman.ysv.freebsd.org (Postfix) with ESMTP id C1AA5E37B21;
 Fri, 20 Oct 2017 14:51:36 +0000 (UTC) (envelope-from cy@FreeBSD.org)
Received: from repo.freebsd.org (repo.freebsd.org
 [IPv6:2610:1c1:1:6068::e6a:0])
 (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
 (Client did not present a certificate)
 by mx1.freebsd.org (Postfix) with ESMTPS id 9068F7DB7B;
 Fri, 20 Oct 2017 14:51:36 +0000 (UTC) (envelope-from cy@FreeBSD.org)
Received: from repo.freebsd.org ([127.0.1.37])
 by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id v9KEpZQt000136;
 Fri, 20 Oct 2017 14:51:35 GMT (envelope-from cy@FreeBSD.org)
Received: (from cy@localhost)
 by repo.freebsd.org (8.15.2/8.15.2/Submit) id v9KEpZDY000133;
 Fri, 20 Oct 2017 14:51:35 GMT (envelope-from cy@FreeBSD.org)
Message-Id: <201710201451.v9KEpZDY000133@repo.freebsd.org>
X-Authentication-Warning: repo.freebsd.org: cy set sender to cy@FreeBSD.org
 using -f
From: Cy Schubert <cy@FreeBSD.org>
Date: Fri, 20 Oct 2017 14:51:35 +0000 (UTC)
To: ports-committers@freebsd.org, svn-ports-all@freebsd.org,
 svn-ports-head@freebsd.org
Subject: svn commit: r452531 - in head/sysutils/nut: . files
X-SVN-Group: ports-head
X-SVN-Commit-Author: cy
X-SVN-Commit-Paths: in head/sysutils/nut: . files
X-SVN-Commit-Revision: 452531
X-SVN-Commit-Repository: ports
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-ports-head@freebsd.org
X-Mailman-Version: 2.1.23
Precedence: list
List-Id: SVN commit messages for the ports tree for head
 <svn-ports-head.freebsd.org>
List-Unsubscribe: <https://lists.freebsd.org/mailman/options/svn-ports-head>, 
 <mailto:svn-ports-head-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-ports-head/>
List-Post: <mailto:svn-ports-head@freebsd.org>
List-Help: <mailto:svn-ports-head-request@freebsd.org?subject=help>
List-Subscribe: <https://lists.freebsd.org/mailman/listinfo/svn-ports-head>,
 <mailto:svn-ports-head-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Fri, 20 Oct 2017 14:51:36 -0000

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) {