Re: pkg/47042: Add DragonflyBSD support to libusb1

[Makoto Fujiwara <makoto%ki.nu@localhost>]

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

From: Makoto Fujiwara <makoto%ki.nu@localhost>
To: gnats-bugs%NetBSD.org@localhost
Cc: John Marino <netbsd%marino.st@localhost>
Subject: Re: pkg/47042: Add DragonflyBSD support to libusb1
Date: Thu, 28 Nov 2013 09:56:57 +0900

 I've confirmed (both i386) DragonFly 3.6 and 3.7.1 (as of Nov. 2013) 
   - does not have libusb equivalent library builtin (by looking at libusb*)
   - packages libusb1 fine (with attached patch)
 
 So, let me commit this, 
 Can I skip builtin.mk for the moment ? > obache@, thanks.
 
 Thanks a lot,
 ---
 Makoto Fujiwara, 
 Chiba, Japan, Narita Airport and Disneyland prefecture.
 
 Index: Makefile
 ===================================================================
 RCS file: /cvs/cvsroot/pkgsrc/devel/libusb1/Makefile,v
 retrieving revision 1.8
 diff -u -r1.8 Makefile
 --- Makefile   20 Nov 2012 13:01:47 -0000      1.8
 +++ Makefile   28 Nov 2013 00:43:27 -0000
 @@ -13,7 +13,7 @@
  COMMENT=      USB Access Library (version 1)
  LICENSE=      gnu-lgpl-v2.1
  
 -NOT_FOR_PLATFORM=     DragonFly-*-* SunOS-*-*
 +NOT_FOR_PLATFORM=     SunOS-*-*
  
  GNU_CONFIGURE=        yes
  USE_LIBTOOL=  yes
 @@ -22,5 +22,9 @@
  PKGCONFIG_OVERRIDE+=  libusb-1.0.pc.in
  
  CONFLICTS=    libusbx-[0-9]*
 +.include "../../mk/bsd.prefs.mk":
 +.if !empty(OPSYS:MDragonFly) && empty(OS_VERSION:M3.[0-7]*)
 +PKG_FAIL_REASON= "DragonFly may have libusb{,1} in base system, use builtin 
one, thanks"
 +.endif
  
  .include "../../mk/bsd.pkg.mk"
 Index: distinfo
 ===================================================================
 RCS file: /cvs/cvsroot/pkgsrc/devel/libusb1/distinfo,v
 retrieving revision 1.4
 diff -u -r1.4 distinfo
 --- distinfo   20 Nov 2012 13:01:47 -0000      1.4
 +++ distinfo   28 Nov 2013 00:43:27 -0000
 @@ -5,4 +5,4 @@
  Size (libusb-1.0.9.tar.bz2) = 421971 bytes
  SHA1 (patch-configure) = 16945e970e356009d1022d9832ef3ee532435422
  SHA1 (patch-configure.ac) = 3d8234d368409a23da0f346822bea276c6081e8b
 -SHA1 (patch-libusb_os_openbsd__usb.c) = 
be31799029f8e2acf7abb6be566a51c78026479d
 +SHA1 (patch-libusb_os_openbsd__usb.c) = 
17d26de122f2c232ea661e1c22646c753a67cf63
 Index: patches/patch-libusb_os_openbsd__usb.c
 ===================================================================
 RCS file: 
/cvs/cvsroot/pkgsrc/devel/libusb1/patches/patch-libusb_os_openbsd__usb.c,v
 retrieving revision 1.3
 diff -u -r1.3 patch-libusb_os_openbsd__usb.c
 --- patches/patch-libusb_os_openbsd__usb.c     20 Nov 2012 13:01:47 -0000      
1.3
 +++ patches/patch-libusb_os_openbsd__usb.c     28 Nov 2013 00:43:27 -0000
 @@ -12,7 +12,18 @@
    *
    * This library is free software; you can redistribute it and/or
    * modify it under the terms of the GNU Lesser General Public
 -@@ -36,8 +36,8 @@
 +@@ -26,14 +26,18 @@
 + #include <string.h>
 + #include <unistd.h>
 + 
 +-#include <dev/usb/usb.h>
 ++#ifdef __DragonFly__
 ++#  include <bus/usb/usb.h>
 ++#else
 ++#  include <dev/usb/usb.h>
 ++#endif
 + 
 + #include "libusb.h"
   #include "libusbi.h"
   
   struct device_priv {