pkgsrc-Bugs archive

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]

pkg/47042: Add DragonflyBSD support to libusb1



>Number:         47042
>Category:       pkg
>Synopsis:       DragonflyBSD not supported
>Confidential:   no
>Severity:       serious
>Priority:       high
>Responsible:    pkg-manager
>State:          open
>Class:          change-request
>Submitter-Id:   net
>Arrival-Date:   Sat Oct 06 08:20:00 +0000 2012
>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@localhost:/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--

>Unformatted:
 --e89a8fb1efa488b7ca04cb5f3a53
 Content-Type: multipart/alternative; boundary=e89a8fb1efa488b7c504cb5f3a51
 
 --e89a8fb1efa488b7c504cb5f3a51
 Content-Type: text/plain; charset=UTF-8
 


Home | Main Index | Thread Index | Old Index