diff options
| author | xtraeme <xtraeme@pkgsrc.org> | 2006-10-22 16:38:40 +0000 |
|---|---|---|
| committer | xtraeme <xtraeme@pkgsrc.org> | 2006-10-22 16:38:40 +0000 |
| commit | 1e05de203cb3c31f1c9097bf5357b4842eb9e4c9 (patch) | |
| tree | 937c013e351ed5bdedec6ea2f0bcadcbf9bd7324 /comms | |
| parent | 8e4f2d66b05d895bab92aef4cedd634b1f55add8 (diff) | |
| download | pkgsrc-1e05de203cb3c31f1c9097bf5357b4842eb9e4c9.tar.gz | |
Make the USB_CHECK test pass correctly on NetBSD, necessary to
enable the USB transport.
Bump PKGREVISION.
Diffstat (limited to 'comms')
| -rw-r--r-- | comms/obexftp/Makefile | 3 | ||||
| -rw-r--r-- | comms/obexftp/distinfo | 4 | ||||
| -rw-r--r-- | comms/obexftp/patches/patch-aa | 27 |
3 files changed, 23 insertions, 11 deletions
diff --git a/comms/obexftp/Makefile b/comms/obexftp/Makefile index 4aa902351af..bf77fcf097b 100644 --- a/comms/obexftp/Makefile +++ b/comms/obexftp/Makefile @@ -1,7 +1,8 @@ -# $NetBSD: Makefile,v 1.8 2006/10/04 20:51:40 wiz Exp $ +# $NetBSD: Makefile,v 1.9 2006/10/22 16:38:40 xtraeme Exp $ # DISTNAME= obexftp-0.20 +PKGREVISION= 1 CATEGORIES= comms MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=openobex/} EXTRACT_SUFX= .tar.bz2 diff --git a/comms/obexftp/distinfo b/comms/obexftp/distinfo index 7c273b5fbe2..1d5e5e31f63 100644 --- a/comms/obexftp/distinfo +++ b/comms/obexftp/distinfo @@ -1,9 +1,9 @@ -$NetBSD: distinfo,v 1.4 2006/07/24 17:07:15 xtraeme Exp $ +$NetBSD: distinfo,v 1.5 2006/10/22 16:38:40 xtraeme Exp $ SHA1 (obexftp-0.20.tar.bz2) = 0b3a7d2aeb0dbd24d75761a7e59f42f46ea5ef82 RMD160 (obexftp-0.20.tar.bz2) = ded5cf4d95eac77d5f6ee0a39f3789eb962534ed Size (obexftp-0.20.tar.bz2) = 351641 bytes -SHA1 (patch-aa) = 7caed98158f6c17c3f3f64f3058f66abcf219559 +SHA1 (patch-aa) = 34e1794f7cf4d06d4edb65cdd36470fa88afdb71 SHA1 (patch-ab) = d4693413a992f53f6aca92d9e920185c1b5e4f0e SHA1 (patch-ac) = d06b6be98745778e2ce8e97762c102d4dbccecfc SHA1 (patch-ad) = 8c3b99cbc2f45fe039aae000aeebb2d5779355f9 diff --git a/comms/obexftp/patches/patch-aa b/comms/obexftp/patches/patch-aa index c4403a21c63..56ec4f03755 100644 --- a/comms/obexftp/patches/patch-aa +++ b/comms/obexftp/patches/patch-aa @@ -1,8 +1,6 @@ -$NetBSD: patch-aa,v 1.2 2006/07/17 12:29:57 xtraeme Exp $ - ---- aclocal.m4.orig 2006-05-16 15:50:36.000000000 +0100 -+++ aclocal.m4 -@@ -56,6 +56,9 @@ if test "$ac_bluetooth_enabled" = yes; t +--- aclocal.m4.orig 2006-05-16 16:50:36.000000000 +0200 ++++ aclocal.m4 2006-10-22 10:07:38.000000000 +0200 +@@ -56,6 +56,9 @@ #ifdef __FreeBSD__ #include <sys/types.h> #include <bluetooth.h> @@ -12,7 +10,7 @@ $NetBSD: patch-aa,v 1.2 2006/07/17 12:29:57 xtraeme Exp $ #else /* Linux */ #include <sys/socket.h> #include <bluetooth/bluetooth.h> -@@ -65,6 +68,9 @@ if test "$ac_bluetooth_enabled" = yes; t +@@ -65,6 +68,9 @@ #ifdef __FreeBSD__ bdaddr_t bdaddr; struct sockaddr_rfcomm addr; @@ -22,7 +20,7 @@ $NetBSD: patch-aa,v 1.2 2006/07/17 12:29:57 xtraeme Exp $ #else /* Linux */ bdaddr_t bdaddr; struct sockaddr_rc addr; -@@ -76,6 +82,7 @@ if test "$ac_bluetooth_enabled" = yes; t +@@ -76,6 +82,7 @@ AC_DEFINE([HAVE_BLUETOOTH], [1], [Define if system supports Bluetooth and it's enabled]) BLUETOOTH_CFLAGS="" BLUETOOTH_LIBS="-lbluetooth" @@ -30,7 +28,7 @@ $NetBSD: patch-aa,v 1.2 2006/07/17 12:29:57 xtraeme Exp $ fi AC_SUBST(BLUETOOTH_CFLAGS) AC_SUBST(BLUETOOTH_LIBS) -@@ -92,14 +99,22 @@ AC_DEFUN([SDPLIB_CHECK],[ +@@ -92,14 +99,22 @@ AC_MSG_CHECKING(for Bluetooth SDP support) AC_TRY_COMPILE( [ @@ -54,3 +52,16 @@ $NetBSD: patch-aa,v 1.2 2006/07/17 12:29:57 xtraeme Exp $ if test $am_cv_sdplib_found = yes; then AC_DEFINE(HAVE_SDPLIB,1,[Define if system supports Bluetooth SDP]) +@@ -118,6 +133,12 @@ + AC_MSG_CHECKING(for USB support) + + AC_TRY_COMPILE( [ ++ #ifdef __NetBSD__ ++ #include <bluetooth.h> ++ #else ++ #include <bluetooth/bluetooth.h> ++ #endif ++ + #include <openobex/obex.h> + #include <openobex/obex_const.h> + ],[ |