Re: pkg/53141: update sysutils/apcupsd to use new libusb framework?

["John D. Baker" <jdbaker%mylinuxisp.com@localhost>]

The following reply was made to PR pkg/53141; it has been noted by GNATS.

From: "John D. Baker" <jdbaker%mylinuxisp.com@localhost>
To: gnats-bugs%NetBSD.org@localhost
Cc: 
Subject: Re: pkg/53141: update sysutils/apcupsd to use new libusb framework?
Date: Thu, 29 Mar 2018 01:16:31 -0500 (CDT)

 Below is a patch to make USB support optional for "apcupsd".
 
 +Index: sysutils/apcupsd/Makefile
 +===================================================================
 +RCS file: /cvsroot/pkgsrc/sysutils/apcupsd/Makefile,v
 +retrieving revision 1.85
 +diff -u -p -r1.85 Makefile
 +--- sysutils/apcupsd/Makefile	12 Mar 2018 11:17:31 -0000	1.85
 ++++ sysutils/apcupsd/Makefile	29 Mar 2018 06:13:18 -0000
 +@@ -36,7 +36,6 @@ WRKSRC=			${WRKDIR}/apcupsd
 + #CONFIGURE_ARGS+=	--with-upscable=${APCUPSD_UPS_TYPE}
 + 
 + CONFIGURE_ARGS+=	--enable-net		# enable NIS network driver
 +-CONFIGURE_ARGS+=	--enable-usb		# enable USB network driver
 + CONFIGURE_ARGS+=	--enable-snmp		# enable SNMP driver
 + CONFIGURE_ARGS+=	--with-lock-dir=${VARBASE}/spool/lock
 + # XXX is this supposed to be the full filename?
 +@@ -112,5 +111,4 @@ post-install:
 + .endfor
 + 
 + .include "../../devel/gettext-lib/buildlink3.mk"
 +-.include "../../devel/libusb/buildlink3.mk"
 + .include "../../mk/bsd.pkg.mk"
 +Index: sysutils/apcupsd/options.mk
 +===================================================================
 +RCS file: /cvsroot/pkgsrc/sysutils/apcupsd/options.mk,v
 +retrieving revision 1.3
 +diff -u -p -r1.3 options.mk
 +--- sysutils/apcupsd/options.mk	1 Aug 2011 14:54:51 -0000	1.3
 ++++ sysutils/apcupsd/options.mk	29 Mar 2018 06:13:42 -0000
 +@@ -1,8 +1,8 @@
 + # $NetBSD: options.mk,v 1.3 2011/08/01 14:54:51 bouyer Exp $
 + 
 + PKG_OPTIONS_VAR=		PKG_OPTIONS.apcupsd
 +-PKG_SUPPORTED_OPTIONS=		cgi
 +-PKG_SUGGESTED_OPTIONS=		cgi
 ++PKG_SUPPORTED_OPTIONS=		cgi usb
 ++PKG_SUGGESTED_OPTIONS=		cgi usb
 + 
 + .include "../../mk/bsd.options.mk"
 + 
 +@@ -13,3 +13,8 @@ CONFIGURE_ARGS+=	--enable-cgi		# include
 + CONFIGURE_ARGS+=	--with-cgi-bin=${PREFIX}/libexec/cgi-bin
 + PLIST.cgi=		yes
 + .endif
 ++
 ++.if !empty(PKG_OPTIONS:Musb)
 ++.  include "../../devel/libusb/buildlink3.mk"
 ++CONFIGURE_ARGS+=	--enable-usb		# include USB support
 ++.endif
 
 -- 
 |/"\ John D. Baker, KN5UKS               NetBSD     Darwin/MacOS X
 |\ / jdbaker[snail]mylinuxisp[flyspeck]com    OpenBSD            FreeBSD
 | X  No HTML/proprietary data in email.   BSD just sits there and works!
 |/ \ GPGkeyID:  D703 4A7E 479F 63F8 D3F4  BD99 9572 8F23 E4AD 1645