NetBSD Problem Report #47042

From kyuupichan@gmail.com  Sat Oct  6 08:19:51 2012
Return-Path: <kyuupichan@gmail.com>
Received: from mail.netbsd.org (mail.netbsd.org [149.20.53.66])
	by www.NetBSD.org (Postfix) with ESMTP id 2C98063B8A7
	for <gnats-bugs@gnats.netbsd.org>; Sat,  6 Oct 2012 08:19:51 +0000 (UTC)
Message-Id: <CAPf5XX4qTh4dOB=4b4rEiJMHvpSSXHBOmmg11CeS1jX_OwN3+w@mail.gmail.com>
Date: Sat, 6 Oct 2012 16:49:30 +0900
From: Neil <kyuupichan@gmail.com>
To: gnats-bugs@gnats.netbsd.org
Subject: Add DragonflyBSD support to libusb1

>Number:         47042
>Category:       pkg
>Synopsis:       DragonflyBSD not supported
>Confidential:   no
>Severity:       serious
>Priority:       high
>Responsible:    dholland
>State:          open
>Class:          change-request
>Submitter-Id:   net
>Arrival-Date:   Sat Oct 06 08:20:00 +0000 2012
>Closed-Date:    
>Last-Modified:  Thu Nov 28 04:08:16 +0000 2013
>Originator:     Neil Booth
>Release:        DragonFly 3.1-DEVELOPMENT
>Organization:
None
>Environment:
System: DragonFly athlon2.akihabara.co.uk 3.1-DEVELOPMENT DragonFly
v3.1.0.571.g9549c-DEVELOPMENT #2: Sat Apr 21 19:08:47 JST 2012
root@athlon2.akihabara.co.uk:/usr/obj/usr/src/sys/X86_64_GENERIC x86_64

>Description:
        Refuses to build on Dragonfly
>How-To-Repeat:
        make build
>Fix:
        diff attached to have this package build and install on Dragonfly.
Also, pasted below.

diff --git a/devel/libusb1/Makefile b/devel/libusb1/Makefile
index 1ad0372..0b7e93d 100644
--- a/devel/libusb1/Makefile
+++ b/devel/libusb1/Makefile
@@ -14,7 +14,7 @@ LICENSE=    gnu-lgpl-v2.1

 PKG_DESTDIR_SUPPORT=    user-destdir

-NOT_FOR_PLATFORM=    DragonFly-*-* SunOS-*-*
+NOT_FOR_PLATFORM=    SunOS-*-*

 GNU_CONFIGURE=    yes
 USE_LIBTOOL=    yes
diff --git a/devel/libusb1/distinfo b/devel/libusb1/distinfo
index 3b39d2a..b2d3406 100644
--- a/devel/libusb1/distinfo
+++ b/devel/libusb1/distinfo
@@ -3,3 +3,6 @@ $NetBSD$
 SHA1 (libusb-1.0.9.tar.bz2) = 025582ff2f6216e2dbc2610ae16b2e073e1b3346
 RMD160 (libusb-1.0.9.tar.bz2) = 5410570f8ce31783044eb04aebaae7ade3b21a61
 Size (libusb-1.0.9.tar.bz2) = 421971 bytes
+SHA1 (patch-configure) = 20201f66d3f6de13dc53b3bdbeb605a971cba9da
+SHA1 (patch-configure.ac) = 26ce0bd6699ef2e834b96128bf088eb84ff78b19
+SHA1 (patch-libusb_os_openbsd__usb.c) =
c46f56145f9fea8ee64f9aa4d8e9703e8497dadc
diff --git a/devel/libusb1/patches/patch-configure
b/devel/libusb1/patches/patch-configure
index e69de29..55c1cd7 100644
--- a/devel/libusb1/patches/patch-configure
+++ b/devel/libusb1/patches/patch-configure
@@ -0,0 +1,16 @@
+$NetBSD$
+
+--- configure.orig    2012-10-06 07:29:32.285323000 +0000
++++ configure
+@@ -11108,6 +11108,11 @@ $as_echo "Darwin/Mac OS X" >&6; }
+ $as_echo "OpenBSD" >&6; }
+     backend="openbsd"
+     ;;
++*-dragonfly*)
++    { $as_echo "$as_me:${as_lineno-$LINENO}: result: DragonflyBSD (using
OpenBSD backend)" >&5
++$as_echo "DragonflyBSD (using OpenBSD backend)" >&6; }
++    backend="openbsd"
++    ;;
+ *-netbsd*)
+     { $as_echo "$as_me:${as_lineno-$LINENO}: result: NetBSD (using
OpenBSD backend)" >&5
+ $as_echo "NetBSD (using OpenBSD backend)" >&6; }
diff --git a/devel/libusb1/patches/patch-configure.acb/devel/libusb1/patches/
patch-configure.ac
index e69de29..6005a7d 100644
--- a/devel/libusb1/patches/patch-configure.ac
+++ b/devel/libusb1/patches/patch-configure.ac
@@ -0,0 +1,15 @@
+$NetBSD$
+
+--- configure.ac.orig    2012-04-20 06:44:27.000000000 +0000
++++ configure.ac
+@@ -58,6 +58,10 @@ case $host in
+     AC_MSG_RESULT([OpenBSD])
+     backend="openbsd"
+     ;;
++*-dragonfly*)
++    AC_MSG_RESULT([DragonflyBSD (using OpenBSD backend)])
++    backend="openbsd"
++    ;;
+ *-netbsd*)
+     AC_MSG_RESULT([NetBSD (using OpenBSD backend)])
+     backend="openbsd"
diff --git a/devel/libusb1/patches/patch-libusb_os_openbsd__usb.c
b/devel/libusb1/patches/patch-libusb_os_openbsd__usb.c
index e69de29..b0bb223 100644
--- a/devel/libusb1/patches/patch-libusb_os_openbsd__usb.c
+++ b/devel/libusb1/patches/patch-libusb_os_openbsd__usb.c
@@ -0,0 +1,16 @@
+$NetBSD$
+
+--- libusb/os/openbsd_usb.c.orig    2012-04-20 06:44:27.000000000 +0000
++++ libusb/os/openbsd_usb.c
+@@ -26,7 +26,11 @@
+ #include <string.h>
+ #include <unistd.h>
+
++#ifdef __DragonFly__
++#include <bus/usb/usb.h>
++#else
+ #include <dev/usb/usb.h>
++#endif
+
+ #include "libusb.h"
+ #include "libusbi.h"

--e89a8fb1efa488b7c504cb5f3a51
Content-Type: text/html; charset=UTF-8
Content-Transfer-Encoding: quoted-printable

&gt;Submitter-Id:=C2=A0 net<br>&gt;Originator:=C2=A0=C2=A0=C2=A0 Neil Booth=
<br>&gt;Organization:=C2=A0 None<br>&gt;Confidential:=C2=A0 no<br>&gt;Synop=
sis:=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0 DragonflyBSD not supported<br>&gt;Severi=
ty:=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0 serious<br>&gt;Priority:=C2=A0=C2=A0=C2=
=A0=C2=A0=C2=A0 high<br>&gt;Category:=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0 pkg<br>
&gt;Class:=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0 change-request<b=
r>&gt;Release:=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0 DragonFly 3.1-DEVELOPMEN=
T<br>&gt;Environment:<br>System: DragonFly <a href=3D"http://athlon2.akihab=
ara.co.uk">athlon2.akihabara.co.uk</a> 3.1-DEVELOPMENT DragonFly v3.1.0.571=
.g9549c-DEVELOPMENT #2: Sat Apr 21 19:08:47 JST 2012 root@athlon2.akihabara=
.co.uk:/usr/obj/usr/src/sys/X86_64_GENERIC x86_64<br>
<br>&gt;Description:<br>=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0 Refuses =
to build on Dragonfly<br>&gt;How-To-Repeat:<br>=C2=A0=C2=A0=C2=A0=C2=A0=C2=
=A0=C2=A0=C2=A0 make build<br>&gt;Fix:<br>=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=
=A0=C2=A0 diff attached to have this package build and install on Dragonfly=
.=C2=A0 Also, pasted below.<br><br>
diff --git a/devel/libusb1/Makefile b/devel/libusb1/Makefile<br>index 1ad03=
72..0b7e93d 100644<br>--- a/devel/libusb1/Makefile<br>+++ b/devel/libusb1/M=
akefile<br>@@ -14,7 +14,7 @@ LICENSE=3D=C2=A0=C2=A0=C2=A0 gnu-lgpl-v2.1<br>=
=C2=A0<br>=C2=A0PKG_DESTDIR_SUPPORT=3D=C2=A0=C2=A0=C2=A0 user-destdir<br>
=C2=A0<br>-NOT_FOR_PLATFORM=3D=C2=A0=C2=A0=C2=A0 DragonFly-*-* SunOS-*-*<br=
>+NOT_FOR_PLATFORM=3D=C2=A0=C2=A0=C2=A0 SunOS-*-*<br>=C2=A0<br>=C2=A0GNU_CO=
NFIGURE=3D=C2=A0=C2=A0=C2=A0 yes<br>=C2=A0USE_LIBTOOL=3D=C2=A0=C2=A0=C2=A0 =
yes<br>diff --git a/devel/libusb1/distinfo b/devel/libusb1/distinfo<br>inde=
x 3b39d2a..b2d3406 100644<br>
--- a/devel/libusb1/distinfo<br>+++ b/devel/libusb1/distinfo<br>@@ -3,3 +3,=
6 @@ $NetBSD$<br>=C2=A0SHA1 (libusb-1.0.9.tar.bz2) =3D 025582ff2f6216e2dbc2=
610ae16b2e073e1b3346<br>=C2=A0RMD160 (libusb-1.0.9.tar.bz2) =3D 5410570f8ce=
31783044eb04aebaae7ade3b21a61<br>
=C2=A0Size (libusb-1.0.9.tar.bz2) =3D 421971 bytes<br>+SHA1 (patch-configur=
e) =3D 20201f66d3f6de13dc53b3bdbeb605a971cba9da<br>+SHA1 (<a href=3D"http:/=
/patch-configure.ac">patch-configure.ac</a>) =3D 26ce0bd6699ef2e834b96128bf=
088eb84ff78b19<br>
+SHA1 (patch-libusb_os_openbsd__usb.c) =3D c46f56145f9fea8ee64f9aa4d8e9703e=
8497dadc<br>diff --git a/devel/libusb1/patches/patch-configure b/devel/libu=
sb1/patches/patch-configure<br>index e69de29..55c1cd7 100644<br>--- a/devel=
/libusb1/patches/patch-configure<br>
+++ b/devel/libusb1/patches/patch-configure<br>@@ -0,0 +1,16 @@<br>+$NetBSD=
$<br>+<br>+--- configure.orig=C2=A0=C2=A0=C2=A0 2012-10-06 07:29:32.2853230=
00 +0000<br>++++ configure<br>+@@ -11108,6 +11108,11 @@ $as_echo &quot;Darw=
in/Mac OS X&quot; &gt;&amp;6; }<br>
+ $as_echo &quot;OpenBSD&quot; &gt;&amp;6; }<br>+ =C2=A0=C2=A0=C2=A0 backen=
d=3D&quot;openbsd&quot;<br>+ =C2=A0=C2=A0=C2=A0 ;;<br>++*-dragonfly*)<br>++=
=C2=A0=C2=A0=C2=A0 { $as_echo &quot;$as_me:${as_lineno-$LINENO}: result: Dr=
agonflyBSD (using OpenBSD backend)&quot; &gt;&amp;5<br>
++$as_echo &quot;DragonflyBSD (using OpenBSD backend)&quot; &gt;&amp;6; }<b=
r>++=C2=A0=C2=A0=C2=A0 backend=3D&quot;openbsd&quot;<br>++=C2=A0=C2=A0=C2=
=A0 ;;<br>+ *-netbsd*)<br>+ =C2=A0=C2=A0=C2=A0 { $as_echo &quot;$as_me:${as=
_lineno-$LINENO}: result: NetBSD (using OpenBSD backend)&quot; &gt;&amp;5<b=
r>
+ $as_echo &quot;NetBSD (using OpenBSD backend)&quot; &gt;&amp;6; }<br>diff=
 --git a/devel/libusb1/patches/<a href=3D"http://patch-configure.ac">patch-=
configure.ac</a> b/devel/libusb1/patches/<a href=3D"http://patch-configure.=
ac">patch-configure.ac</a><br>
index e69de29..6005a7d 100644<br>--- a/devel/libusb1/patches/<a href=3D"htt=
p://patch-configure.ac">patch-configure.ac</a><br>+++ b/devel/libusb1/patch=
es/<a href=3D"http://patch-configure.ac">patch-configure.ac</a><br>@@ -0,0 =
+1,15 @@<br>
+$NetBSD$<br>+<br>+--- configure.ac.orig=C2=A0=C2=A0=C2=A0 2012-04-20 06:44=
:27.000000000 +0000<br>++++ <a href=3D"http://configure.ac">configure.ac</a=
><br>+@@ -58,6 +58,10 @@ case $host in<br>+ =C2=A0=C2=A0=C2=A0 AC_MSG_RESUL=
T([OpenBSD])<br>+ =C2=A0=C2=A0=C2=A0 backend=3D&quot;openbsd&quot;<br>
+ =C2=A0=C2=A0=C2=A0 ;;<br>++*-dragonfly*)<br>++=C2=A0=C2=A0=C2=A0 AC_MSG_R=
ESULT([DragonflyBSD (using OpenBSD backend)])<br>++=C2=A0=C2=A0=C2=A0 backe=
nd=3D&quot;openbsd&quot;<br>++=C2=A0=C2=A0=C2=A0 ;;<br>+ *-netbsd*)<br>+ =
=C2=A0=C2=A0=C2=A0 AC_MSG_RESULT([NetBSD (using OpenBSD backend)])<br>+ =C2=
=A0=C2=A0=C2=A0 backend=3D&quot;openbsd&quot;<br>
diff --git a/devel/libusb1/patches/patch-libusb_os_openbsd__usb.c b/devel/l=
ibusb1/patches/patch-libusb_os_openbsd__usb.c<br>index e69de29..b0bb223 100=
644<br>--- a/devel/libusb1/patches/patch-libusb_os_openbsd__usb.c<br>+++ b/=
devel/libusb1/patches/patch-libusb_os_openbsd__usb.c<br>
@@ -0,0 +1,16 @@<br>+$NetBSD$<br>+<br>+--- libusb/os/openbsd_usb.c.orig=C2=
=A0=C2=A0=C2=A0 2012-04-20 06:44:27.000000000 +0000<br>++++ libusb/os/openb=
sd_usb.c<br>+@@ -26,7 +26,11 @@<br>+ #include &lt;string.h&gt;<br>+ #includ=
e &lt;unistd.h&gt;<br>
+ <br>++#ifdef __DragonFly__<br>++#include &lt;bus/usb/usb.h&gt;<br>++#else=
<br>+ #include &lt;dev/usb/usb.h&gt;<br>++#endif<br>+ <br>+ #include &quot;=
libusb.h&quot;<br>+ #include &quot;libusbi.h&quot;<br>

--e89a8fb1efa488b7c504cb5f3a51--
--e89a8fb1efa488b7ca04cb5f3a53
Content-Type: application/octet-stream; name="libusb1-dragonfly.patch"
Content-Disposition: attachment; filename="libusb1-dragonfly.patch"
Content-Transfer-Encoding: base64
X-Attachment-Id: f_h7yf94kp0

ZGlmZiAtLWdpdCBhL2RldmVsL2xpYnVzYjEvTWFrZWZpbGUgYi9kZXZlbC9saWJ1c2IxL01ha2Vm
aWxlCmluZGV4IDFhZDAzNzIuLjBiN2U5M2QgMTAwNjQ0Ci0tLSBhL2RldmVsL2xpYnVzYjEvTWFr
ZWZpbGUKKysrIGIvZGV2ZWwvbGlidXNiMS9NYWtlZmlsZQpAQCAtMTQsNyArMTQsNyBAQCBMSUNF
TlNFPQlnbnUtbGdwbC12Mi4xCiAKIFBLR19ERVNURElSX1NVUFBPUlQ9CXVzZXItZGVzdGRpcgog
Ci1OT1RfRk9SX1BMQVRGT1JNPQlEcmFnb25GbHktKi0qIFN1bk9TLSotKgorTk9UX0ZPUl9QTEFU
Rk9STT0JU3VuT1MtKi0qCiAKIEdOVV9DT05GSUdVUkU9CXllcwogVVNFX0xJQlRPT0w9CXllcwpk
aWZmIC0tZ2l0IGEvZGV2ZWwvbGlidXNiMS9kaXN0aW5mbyBiL2RldmVsL2xpYnVzYjEvZGlzdGlu
Zm8KaW5kZXggM2IzOWQyYS4uYjJkMzQwNiAxMDA2NDQKLS0tIGEvZGV2ZWwvbGlidXNiMS9kaXN0
aW5mbworKysgYi9kZXZlbC9saWJ1c2IxL2Rpc3RpbmZvCkBAIC0zLDMgKzMsNiBAQCAkTmV0QlNE
JAogU0hBMSAobGlidXNiLTEuMC45LnRhci5iejIpID0gMDI1NTgyZmYyZjYyMTZlMmRiYzI2MTBh
ZTE2YjJlMDczZTFiMzM0NgogUk1EMTYwIChsaWJ1c2ItMS4wLjkudGFyLmJ6MikgPSA1NDEwNTcw
ZjhjZTMxNzgzMDQ0ZWIwNGFlYmFhZTdhZGUzYjIxYTYxCiBTaXplIChsaWJ1c2ItMS4wLjkudGFy
LmJ6MikgPSA0MjE5NzEgYnl0ZXMKK1NIQTEgKHBhdGNoLWNvbmZpZ3VyZSkgPSAyMDIwMWY2NmQz
ZjZkZTEzZGM1M2IzYmRiZWI2MDVhOTcxY2JhOWRhCitTSEExIChwYXRjaC1jb25maWd1cmUuYWMp
ID0gMjZjZTBiZDY2OTllZjJlODM0Yjk2MTI4YmYwODhlYjg0ZmY3OGIxOQorU0hBMSAocGF0Y2gt
bGlidXNiX29zX29wZW5ic2RfX3VzYi5jKSA9IGM0NmY1NjE0NWY5ZmVhOGVlNjRmOWFhNGQ4ZTk3
MDNlODQ5N2RhZGMKZGlmZiAtLWdpdCBhL2RldmVsL2xpYnVzYjEvcGF0Y2hlcy9wYXRjaC1jb25m
aWd1cmUgYi9kZXZlbC9saWJ1c2IxL3BhdGNoZXMvcGF0Y2gtY29uZmlndXJlCmluZGV4IGU2OWRl
MjkuLjU1YzFjZDcgMTAwNjQ0Ci0tLSBhL2RldmVsL2xpYnVzYjEvcGF0Y2hlcy9wYXRjaC1jb25m
aWd1cmUKKysrIGIvZGV2ZWwvbGlidXNiMS9wYXRjaGVzL3BhdGNoLWNvbmZpZ3VyZQpAQCAtMCww
ICsxLDE2IEBACiskTmV0QlNEJAorCistLS0gY29uZmlndXJlLm9yaWcJMjAxMi0xMC0wNiAwNzoy
OTozMi4yODUzMjMwMDAgKzAwMDAKKysrKyBjb25maWd1cmUKK0BAIC0xMTEwOCw2ICsxMTEwOCwx
MSBAQCAkYXNfZWNobyAiRGFyd2luL01hYyBPUyBYIiA+JjY7IH0KKyAkYXNfZWNobyAiT3BlbkJT
RCIgPiY2OyB9CisgCWJhY2tlbmQ9Im9wZW5ic2QiCisgCTs7CisrKi1kcmFnb25mbHkqKQorKwl7
ICRhc19lY2hvICIkYXNfbWU6JHthc19saW5lbm8tJExJTkVOT306IHJlc3VsdDogRHJhZ29uZmx5
QlNEICh1c2luZyBPcGVuQlNEIGJhY2tlbmQpIiA+JjUKKyskYXNfZWNobyAiRHJhZ29uZmx5QlNE
ICh1c2luZyBPcGVuQlNEIGJhY2tlbmQpIiA+JjY7IH0KKysJYmFja2VuZD0ib3BlbmJzZCIKKysJ
OzsKKyAqLW5ldGJzZCopCisgCXsgJGFzX2VjaG8gIiRhc19tZToke2FzX2xpbmVuby0kTElORU5P
fTogcmVzdWx0OiBOZXRCU0QgKHVzaW5nIE9wZW5CU0QgYmFja2VuZCkiID4mNQorICRhc19lY2hv
ICJOZXRCU0QgKHVzaW5nIE9wZW5CU0QgYmFja2VuZCkiID4mNjsgfQpkaWZmIC0tZ2l0IGEvZGV2
ZWwvbGlidXNiMS9wYXRjaGVzL3BhdGNoLWNvbmZpZ3VyZS5hYyBiL2RldmVsL2xpYnVzYjEvcGF0
Y2hlcy9wYXRjaC1jb25maWd1cmUuYWMKaW5kZXggZTY5ZGUyOS4uNjAwNWE3ZCAxMDA2NDQKLS0t
IGEvZGV2ZWwvbGlidXNiMS9wYXRjaGVzL3BhdGNoLWNvbmZpZ3VyZS5hYworKysgYi9kZXZlbC9s
aWJ1c2IxL3BhdGNoZXMvcGF0Y2gtY29uZmlndXJlLmFjCkBAIC0wLDAgKzEsMTUgQEAKKyROZXRC
U0QkCisKKy0tLSBjb25maWd1cmUuYWMub3JpZwkyMDEyLTA0LTIwIDA2OjQ0OjI3LjAwMDAwMDAw
MCArMDAwMAorKysrIGNvbmZpZ3VyZS5hYworQEAgLTU4LDYgKzU4LDEwIEBAIGNhc2UgJGhvc3Qg
aW4KKyAJQUNfTVNHX1JFU1VMVChbT3BlbkJTRF0pCisgCWJhY2tlbmQ9Im9wZW5ic2QiCisgCTs7
CisrKi1kcmFnb25mbHkqKQorKwlBQ19NU0dfUkVTVUxUKFtEcmFnb25mbHlCU0QgKHVzaW5nIE9w
ZW5CU0QgYmFja2VuZCldKQorKwliYWNrZW5kPSJvcGVuYnNkIgorKwk7OworICotbmV0YnNkKikK
KyAJQUNfTVNHX1JFU1VMVChbTmV0QlNEICh1c2luZyBPcGVuQlNEIGJhY2tlbmQpXSkKKyAJYmFj
a2VuZD0ib3BlbmJzZCIKZGlmZiAtLWdpdCBhL2RldmVsL2xpYnVzYjEvcGF0Y2hlcy9wYXRjaC1s
aWJ1c2Jfb3Nfb3BlbmJzZF9fdXNiLmMgYi9kZXZlbC9saWJ1c2IxL3BhdGNoZXMvcGF0Y2gtbGli
dXNiX29zX29wZW5ic2RfX3VzYi5jCmluZGV4IGU2OWRlMjkuLmIwYmIyMjMgMTAwNjQ0Ci0tLSBh
L2RldmVsL2xpYnVzYjEvcGF0Y2hlcy9wYXRjaC1saWJ1c2Jfb3Nfb3BlbmJzZF9fdXNiLmMKKysr
IGIvZGV2ZWwvbGlidXNiMS9wYXRjaGVzL3BhdGNoLWxpYnVzYl9vc19vcGVuYnNkX191c2IuYwpA
QCAtMCwwICsxLDE2IEBACiskTmV0QlNEJAorCistLS0gbGlidXNiL29zL29wZW5ic2RfdXNiLmMu
b3JpZwkyMDEyLTA0LTIwIDA2OjQ0OjI3LjAwMDAwMDAwMCArMDAwMAorKysrIGxpYnVzYi9vcy9v
cGVuYnNkX3VzYi5jCitAQCAtMjYsNyArMjYsMTEgQEAKKyAjaW5jbHVkZSA8c3RyaW5nLmg+Cisg
I2luY2x1ZGUgPHVuaXN0ZC5oPgorIAorKyNpZmRlZiBfX0RyYWdvbkZseV9fCisrI2luY2x1ZGUg
PGJ1cy91c2IvdXNiLmg+CisrI2Vsc2UKKyAjaW5jbHVkZSA8ZGV2L3VzYi91c2IuaD4KKysjZW5k
aWYKKyAKKyAjaW5jbHVkZSAibGlidXNiLmgiCisgI2luY2x1ZGUgImxpYnVzYmkuaCIK
--e89a8fb1efa488b7ca04cb5f3a53--

>Release-Note:

>Audit-Trail:

Responsible-Changed-From-To: pkg-manager->dragonfly-pkg-people
Responsible-Changed-By: hauke@NetBSD.org
Responsible-Changed-When: Sun, 07 Oct 2012 18:24:45 +0000
Responsible-Changed-Why:
This is a DragonFly issue.


Responsible-Changed-From-To: dragonfly-pkg-people->dfly-pkg-people
Responsible-Changed-By: hauke@NetBSD.org
Responsible-Changed-When: Sun, 07 Oct 2012 18:45:25 +0000
Responsible-Changed-Why:
Whatever alias works this month...


From: "David A. Holland" <dholland@netbsd.org>
To: gnats-bugs@gnats.NetBSD.org
Cc: 
Subject: PR/47042 CVS commit: pkgsrc/devel/libusb1
Date: Mon, 8 Oct 2012 16:54:07 +0000

 Module Name:	pkgsrc
 Committed By:	dholland
 Date:		Mon Oct  8 16:54:07 UTC 2012

 Modified Files:
 	pkgsrc/devel/libusb1: Makefile distinfo
 Added Files:
 	pkgsrc/devel/libusb1/patches: patch-configure patch-configure.ac
 	    patch-libusb_os_openbsd__usb.c

 Log Message:
 Build patches for DragonFly, from Neil Booth in PR 47042.


 To generate a diff of this commit:
 cvs rdiff -u -r1.4 -r1.5 pkgsrc/devel/libusb1/Makefile
 cvs rdiff -u -r1.1.1.1 -r1.2 pkgsrc/devel/libusb1/distinfo
 cvs rdiff -u -r0 -r1.1 pkgsrc/devel/libusb1/patches/patch-configure \
     pkgsrc/devel/libusb1/patches/patch-configure.ac \
     pkgsrc/devel/libusb1/patches/patch-libusb_os_openbsd__usb.c

 Please note that diffs are not public domain; they are subject to the
 copyright notices on the relevant files.

Responsible-Changed-From-To: dfly-pkg-people->dholland
Responsible-Changed-By: dholland@NetBSD.org
Responsible-Changed-When: Mon, 08 Oct 2012 16:58:08 +0000
Responsible-Changed-Why:
I committed it


State-Changed-From-To: open->feedback
State-Changed-By: dholland@NetBSD.org
State-Changed-When: Mon, 08 Oct 2012 16:58:08 +0000
State-Changed-Why:
I didn't get the same sha-1 sums from your patch that you did, so please
crosscheck in case I did something stupid.


From: "David A. Holland" <dholland@netbsd.org>
To: gnats-bugs@gnats.NetBSD.org
Cc: 
Subject: PR/47042 CVS commit: pkgsrc/devel/libusb1
Date: Mon, 8 Oct 2012 19:16:18 +0000

 Module Name:	pkgsrc
 Committed By:	dholland
 Date:		Mon Oct  8 19:16:17 UTC 2012

 Modified Files:
 	pkgsrc/devel/libusb1: Makefile

 Log Message:
 Revert part of previous: leave this marked NOT_FOR_PLATFORM for Dragonfly
 by request of John Marino. But leave the patches in place as they are
 harmless. Affects PR 47042.


 To generate a diff of this commit:
 cvs rdiff -u -r1.5 -r1.6 pkgsrc/devel/libusb1/Makefile

 Please note that diffs are not public domain; they are subject to the
 copyright notices on the relevant files.

Responsible-Changed-From-To: dholland->marino
Responsible-Changed-By: dholland@NetBSD.org
Responsible-Changed-When: Mon, 08 Oct 2012 19:22:25 +0000
Responsible-Changed-Why:
Could you discuss your concerns with the submitter? Not much point in me
being an intermediary.


From: Neil <kyuupichan@gmail.com>
To: gnats-bugs@gnats.netbsd.org
Cc: 
Subject: Re: pkg/47042
Date: Thu, 20 Dec 2012 14:12:31 +0900

 --e89a8f6438f227740204d141c742
 Content-Type: text/plain; charset=UTF-8

 Please close; I've not heard anything

 --e89a8f6438f227740204d141c742
 Content-Type: text/html; charset=UTF-8

 <div dir="ltr">Please close; I&#39;ve not heard anything<br></div>

 --e89a8f6438f227740204d141c742--

Responsible-Changed-From-To: marino->dholland
Responsible-Changed-By: dholland@NetBSD.org
Responsible-Changed-When: Fri, 21 Dec 2012 17:27:47 +0000
Responsible-Changed-Why:
no response


State-Changed-From-To: feedback->closed
State-Changed-By: dholland@NetBSD.org
State-Changed-When: Fri, 21 Dec 2012 17:27:47 +0000
State-Changed-Why:
patches committed; to use it on dragonfly just comment out the NOT_FOR line.


From: John Marino <netbsd@marino.st>
To: gnats-bugs@NetBSD.org
Cc: dholland@NetBSD.org, marino@NetBSD.org, pkgsrc-bugs@netbsd.org, 
 gnats-admin@netbsd.org, Neil <kyuupichan@gmail.com>
Subject: Re: pkg/47042 (DragonflyBSD not supported)
Date: Fri, 21 Dec 2012 21:18:45 +0100

 On 12/21/2012 18:27, dholland@NetBSD.org wrote:
 > Synopsis: DragonflyBSD not supported
 >
 > Responsible-Changed-From-To: marino->dholland
 > Responsible-Changed-By: dholland@NetBSD.org
 > Responsible-Changed-When: Fri, 21 Dec 2012 17:27:47 +0000
 > Responsible-Changed-Why:
 > no response
 >
 >
 > State-Changed-From-To: feedback->closed
 > State-Changed-By: dholland@NetBSD.org
 > State-Changed-When: Fri, 21 Dec 2012 17:27:47 +0000
 > State-Changed-Why:
 > patches committed; to use it on dragonfly just comment out the NOT_FOR line.

 I confirm we don't want this active.
 libusb has since been ported to base -- we made the decision some weeks 
 ago to leave libusb as NOT-FOR-DRAGONFLY and we'll use whatever 
 mechanism freebsd does for the pkgs.

From: David Holland <dholland-pbugs@netbsd.org>
To: gnats-bugs@NetBSD.org
Cc: 
Subject: Re: pkg/47042 (DragonflyBSD not supported)
Date: Fri, 21 Dec 2012 20:31:01 +0000

 On Fri, Dec 21, 2012 at 08:20:07PM +0000, John Marino wrote:
  >> patches committed; to use it on dragonfly just comment out the
  >> NOT_FOR line.
  >  
  >  I confirm we don't want this active.
  >  libusb has since been ported to base -- we made the decision some weeks 
  >  ago to leave libusb as NOT-FOR-DRAGONFLY and we'll use whatever 
  >  mechanism freebsd does for the pkgs.

 I haven't changed anything today.

 -- 
 David A. Holland
 dholland@netbsd.org

From: Makoto Fujiwara <makoto@ki.nu>
To: gnats-bugs@netbsd.org
Cc: 
Subject: Re: pkg/47042: Add DragonflyBSD support to libusb1
Date: Thu, 10 Oct 2013 18:15:50 +0900

 Hi,
   I noticed today that one part of the original PR is not
 committed yet, and I needed the attache patch with
  DragonFly v3.4.2-RELEASE #2: Mon May 27 20:28:43 PDT 2013
  root@pkgbox32.dragonflybsd.org:/usr/obj/build/home/justin/src/sys/GENERIC
  i386

  (Shall I commit this part ?)
 Thanks
 ---
 Makoto Fujiwara

 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	10 Oct 2013 08:46:21 -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) = 8276c9c0102e1e52a71a033a86ea89718b262377
 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	10 Oct 2013 08:46:21 -0000
 @@ -12,7 +12,17 @@
    *
    * 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>
 + 
 ++#ifdef __DragonFly__
 ++#include <bus/usb/usb.h>
 ++#else
 + #include <dev/usb/usb.h>
 ++#endif
 + 
 + #include "libusb.h"
   #include "libusbi.h"

   struct device_priv {

From: David Holland <dholland-pbugs@netbsd.org>
To: gnats-bugs@NetBSD.org
Cc: 
Subject: Re: pkg/47042: Add DragonflyBSD support to libusb1
Date: Thu, 10 Oct 2013 16:18:40 +0000

 On Thu, Oct 10, 2013 at 09:20:00AM +0000, Makoto Fujiwara wrote:
  >    I noticed today that one part of the original PR is not
  >  committed yet, and I needed the attache patch with
  >   DragonFly v3.4.2-RELEASE #2: Mon May 27 20:28:43 PDT 2013
  >   root@pkgbox32.dragonflybsd.org:/usr/obj/build/home/justin/src/sys/GENERIC
  >   i386
  >  
  >   (Shall I commit this part ?)

 Yeah, just commit that.

 -- 
 David A. Holland
 dholland@netbsd.org

From: Makoto Fujiwara <makoto@ki.nu>
To: gnats-bugs@NetBSD.org
Cc: Neil <kyuupichan@gmail.com>, netbsd@marino.st
Subject: Re: pkg/47042: Add DragonflyBSD support to libusb1
Date: Fri, 11 Oct 2013 10:10:04 +0900

 Before committing this small change, having read DragonFly folks saying

 (John Marino wrote):
  | I confirm we don't want this active.

  | libusb has since been ported to base -- we made the decision
  | some weeks ago to leave libusb as NOT-FOR-DRAGONFLY and we'll
  | use whatever mechanism freebsd does for the pkgs.

 I'd like to make sure, this really should be done.

 When packaging wip/libftdi1, it asks libusb.h and it is only 
 found in libusb1 (not libusb), I believe. 
 I did not test on 3.5-Development. Is it in there ?

 | dragon342@makoto 08:57:38/131011(..devel/libusb1)% pkg_info |grep libusb 
 | libusb-0.1.12nb3    USB access library (version 0)
 | libusb1-1.0.9nb1    USB Access Library (version 1)

 Thanks for reading,
 ---
 Makoto Fujiwara

From: John Marino <netbsd@marino.st>
To: Makoto Fujiwara <makoto@ki.nu>
Cc: gnats-bugs@NetBSD.org, Neil <kyuupichan@gmail.com>
Subject: Re: pkg/47042: Add DragonflyBSD support to libusb1
Date: Fri, 11 Oct 2013 03:21:55 +0200

 On 10/11/2013 03:10, Makoto Fujiwara wrote:
 > Before committing this small change, having read DragonFly folks saying
 > 
 > (John Marino wrote):
 >  | I confirm we don't want this active.
 > 
 >  | libusb has since been ported to base -- we made the decision
 >  | some weeks ago to leave libusb as NOT-FOR-DRAGONFLY and we'll
 >  | use whatever mechanism freebsd does for the pkgs.
 > 
 > I'd like to make sure, this really should be done.
 > 
 > When packaging wip/libftdi1, it asks libusb.h and it is only 
 > found in libusb1 (not libusb), I believe. 
 > I did not test on 3.5-Development. Is it in there ?

 It's there, but it's not on by default as it is still buggy.  I don't
 really have any advice for you other than assume it's there because A)
 it could be and B) one day it will be default.

 I was hopeing it would be solid by now, but alas no.
 Regards,
 John

From: Makoto Fujiwara <makoto@ki.nu>
To: John Marino <netbsd@marino.st>
Cc: gnats-bugs@NetBSD.org, Neil <kyuupichan@gmail.com>
Subject: Re: pkg/47042: Add DragonflyBSD support to libusb1
Date: Fri, 11 Oct 2013 12:04:04 +0900

 John,
 Thanks for the quick input

 How about the patch attached ?
 ---
 Makoto Fujiwara, 
 Chiba, Japan, Narita Airport and Disneyland prefecture.

 Index: devel/libusb1/Makefile
 ===================================================================
 RCS file: /cvsroot/pkgsrc/devel/libusb1/Makefile,v
 retrieving revision 1.8
 diff -u -r1.8 Makefile
 --- devel/libusb1/Makefile	20 Nov 2012 13:01:47 -0000	1.8
 +++ devel/libusb1/Makefile	11 Oct 2013 03:03:09 -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
 @@ -23,4 +23,9 @@

  CONFLICTS=	libusbx-[0-9]*

 +.include "../../mk/bsd.prefs.mk":
 +.if !empty(OPSYS:MDragonFly) && empty(OS_VERSION:M3.[0-4]*)
 +PKG_FAIL_REASON=	"DragonFly 3.5 or later has libusb{,1} in base system, use builtin one, thanks"
 +.endif
 +
  .include "../../mk/bsd.pkg.mk"

From: "OBATA Akio" <obache@netbsd.org>
To: gnats-bugs@netbsd.org
Cc: 
Subject: Re: pkg/47042: Add DragonflyBSD support to libusb1
Date: Fri, 11 Oct 2013 13:40:12 +0900

 devel/libusb1/builtin.mk should be created.

From: John Marino <netbsd@marino.st>
To: Makoto Fujiwara <makoto@ki.nu>
Cc: gnats-bugs@NetBSD.org, Neil <kyuupichan@gmail.com>
Subject: Re: pkg/47042: Add DragonflyBSD support to libusb1
Date: Fri, 11 Oct 2013 08:27:54 +0200

 On 10/11/2013 05:04, Makoto Fujiwara wrote:
 > John,
 > Thanks for the quick input
 > 
 > How about the patch attached ?
 > ---

 It's fine, although I am not sure devel/libusb1 builds on Dragonfly as
 it is now.  In any case, the patch is okay regardless if libusb1 builds
 or not.

 Regards,
 John

From: Makoto Fujiwara <makoto@ki.nu>
To: gnats-bugs@NetBSD.org
Cc: John Marino <netbsd@marino.st>
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 {

From: David Holland <dholland-pbugs@netbsd.org>
To: gnats-bugs@NetBSD.org
Cc: 
Subject: Re: pkg/47042: Add DragonflyBSD support to libusb1
Date: Thu, 28 Nov 2013 03:49:04 +0000

 On Thu, Nov 28, 2013 at 01:00:01AM +0000, Makoto Fujiwara wrote:
  >  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.

 I don't know. It seems to be a political issue on the dragonfly side
 and I don't have any idea what that's about.

 I would go ahead and commit all but the NOT_FOR/PKG_FAIL bit and then
 try to get an answer from them about that part.

 -- 
 David A. Holland
 dholland@netbsd.org

From: David Holland <dholland-pbugs@netbsd.org>
To: gnats-bugs@netbsd.org
Cc: 
Subject: Re: pkg/47042: Add DragonflyBSD support to libusb1
Date: Thu, 28 Nov 2013 03:52:04 +0000

 On Thu, Nov 28, 2013 at 03:50:00AM +0000, David Holland wrote:
  >  I would go ahead and commit all but the NOT_FOR/PKG_FAIL bit and then
  >  try to get an answer from them about that part.

 actually I guess there's an answer of sorts in the PR.

 The reason there ought to be a builtin.mk is that then whether it is
 or isn't natively available on Dragonfly gets handled automatically,
 and there's no need for the NOT_FOR/PKG_FAIL stuff.

 -- 
 David A. Holland
 dholland@netbsd.org

State-Changed-From-To: closed->open
State-Changed-By: dholland@NetBSD.org
State-Changed-When: Thu, 28 Nov 2013 04:08:16 +0000
State-Changed-Why:
some bits left to commit, let's make sure they don't get forgotten.


>Unformatted:
 --e89a8fb1efa488b7ca04cb5f3a53
 Content-Type: multipart/alternative; boundary=e89a8fb1efa488b7c504cb5f3a51

 --e89a8fb1efa488b7c504cb5f3a51
 Content-Type: text/plain; charset=UTF-8

NetBSD Home
NetBSD PR Database Search

(Contact us) $NetBSD: query-full-pr,v 1.39 2013/11/01 18:47:49 spz Exp $
$NetBSD: gnats_config.sh,v 1.8 2006/05/07 09:23:38 tsutsui Exp $
Copyright © 1994-2007 The NetBSD Foundation, Inc. ALL RIGHTS RESERVED.