summaryrefslogtreecommitdiff
path: root/comms/openobex
diff options
context:
space:
mode:
Diffstat (limited to 'comms/openobex')
-rw-r--r--comms/openobex/Makefile20
-rw-r--r--comms/openobex/PLIST3
-rw-r--r--comms/openobex/buildlink3.mk4
-rw-r--r--comms/openobex/distinfo15
-rw-r--r--comms/openobex/patches/patch-aa13
-rw-r--r--comms/openobex/patches/patch-ab35
-rw-r--r--comms/openobex/patches/patch-ac27
-rw-r--r--comms/openobex/patches/patch-ad14
-rw-r--r--comms/openobex/patches/patch-ae15
-rw-r--r--comms/openobex/patches/patch-af31
-rw-r--r--comms/openobex/patches/patch-ag24
11 files changed, 37 insertions, 164 deletions
diff --git a/comms/openobex/Makefile b/comms/openobex/Makefile
index 523e42a16ad..1549e11cec1 100644
--- a/comms/openobex/Makefile
+++ b/comms/openobex/Makefile
@@ -1,15 +1,16 @@
-# $NetBSD: Makefile,v 1.17 2009/03/20 19:42:20 hasso Exp $
+# $NetBSD: Makefile,v 1.18 2009/08/07 12:18:33 plunky Exp $
#
-DISTNAME= openobex-1.3
-PKGREVISION= 2
+DISTNAME= openobex-1.5
CATEGORIES= comms
MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=openobex/}
MAINTAINER= pkgsrc-users@NetBSD.org
-HOMEPAGE= http://openobex.triq.net/
+HOMEPAGE= http://www.openobex.org/
COMMENT= Implementation of the Object Exchange (OBEX) protocol
+LICENSE= gnu-lgpl-v2
+
PKG_DESTDIR_SUPPORT= user-destdir
GNU_CONFIGURE= yes
@@ -18,17 +19,6 @@ USE_LIBTOOL= yes
PKGCONFIG_OVERRIDE= openobex.pc.in
-.include "../../mk/bsd.prefs.mk"
-
-.if ((${OPSYS} == "NetBSD" && exists(/usr/include/bluetooth.h)) || ${OPSYS} == "DragonFly")
-SUBST_CLASSES+= bt
-SUBST_STAGE.bt= post-patch
-SUBST_FILES.bt= include/obex.h
-SUBST_SED.bt= -e "s,\#ifndef SOL_RFCOMM,\#if defined(__NetBSD__) || defined(__DragonFly__),"
-SUBST_SED.bt+= -e "s,typedef char\* bdaddr_t\;,\#include \<bluetooth.h\>,"
-SUBST_MESSAGE.bt= Fixing bluetooth detection.
-.endif
-
post-patch:
cd ${WRKSRC} && autoconf
diff --git a/comms/openobex/PLIST b/comms/openobex/PLIST
index ac70f71fe78..5c8fec0fbbe 100644
--- a/comms/openobex/PLIST
+++ b/comms/openobex/PLIST
@@ -1,6 +1,5 @@
-@comment $NetBSD: PLIST,v 1.4 2009/06/14 17:38:41 joerg Exp $
+@comment $NetBSD: PLIST,v 1.5 2009/08/07 12:18:33 plunky Exp $
include/openobex/obex.h
include/openobex/obex_const.h
lib/libopenobex.la
lib/pkgconfig/openobex.pc
-share/aclocal/openobex.m4
diff --git a/comms/openobex/buildlink3.mk b/comms/openobex/buildlink3.mk
index 857962688c2..924f8e034c9 100644
--- a/comms/openobex/buildlink3.mk
+++ b/comms/openobex/buildlink3.mk
@@ -1,11 +1,11 @@
-# $NetBSD: buildlink3.mk,v 1.11 2009/03/20 19:24:03 joerg Exp $
+# $NetBSD: buildlink3.mk,v 1.12 2009/08/07 12:18:33 plunky Exp $
BUILDLINK_TREE+= openobex
.if !defined(OPENOBEX_BUILDLINK3_MK)
OPENOBEX_BUILDLINK3_MK:=
-BUILDLINK_API_DEPENDS.openobex+= openobex>=1.3
+BUILDLINK_API_DEPENDS.openobex+= openobex>=1.5
BUILDLINK_PKGSRCDIR.openobex?= ../../comms/openobex
.include "../../devel/libusb/buildlink3.mk"
diff --git a/comms/openobex/distinfo b/comms/openobex/distinfo
index 16e5bc230f4..f49cef63a3f 100644
--- a/comms/openobex/distinfo
+++ b/comms/openobex/distinfo
@@ -1,11 +1,6 @@
-$NetBSD: distinfo,v 1.5 2006/07/09 09:27:52 xtraeme Exp $
+$NetBSD: distinfo,v 1.6 2009/08/07 12:18:33 plunky Exp $
-SHA1 (openobex-1.3.tar.gz) = a6fbb5991bc14b90ba6c42faf026bf6bfa325d7f
-RMD160 (openobex-1.3.tar.gz) = f38474e17aaff1799ecb5f45de6ab23c3bdc8de0
-Size (openobex-1.3.tar.gz) = 337614 bytes
-SHA1 (patch-aa) = bc1c17a9f040f2e3c1b82b9b0070026d829e4a21
-SHA1 (patch-ab) = 84f76f808634dbeaed74a69469a91be1322b9bf1
-SHA1 (patch-ac) = 4e8075984d5a957bfb2fda3b63872063252b7b75
-SHA1 (patch-ad) = 0aa9962a170716fd93f115ac3bdb7307e31081a1
-SHA1 (patch-ae) = 9292387331847631b74e1331f50bab247bdb19b0
-SHA1 (patch-af) = d9a913a695a27f487ba496629bd37a8904c364b4
+SHA1 (openobex-1.5.tar.gz) = ff5fc07287d67fa73ec55998f76ed73787a2ddb1
+RMD160 (openobex-1.5.tar.gz) = 9c57faabd6e63ff809e27ab90ed5db788802c45c
+Size (openobex-1.5.tar.gz) = 400876 bytes
+SHA1 (patch-ag) = 3276e9836c02e2e7fc56ba819e08c647369b1cff
diff --git a/comms/openobex/patches/patch-aa b/comms/openobex/patches/patch-aa
deleted file mode 100644
index b4ce5c27221..00000000000
--- a/comms/openobex/patches/patch-aa
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD: patch-aa,v 1.2 2006/07/09 09:27:52 xtraeme Exp $
-
---- configure.in.orig 2006-06-14 11:24:13.000000000 +0200
-+++ configure.in 2006-07-09 10:01:18.000000000 +0200
-@@ -23,6 +23,8 @@
- AC_PATH_BLUEZ
- AC_PATH_USB
-
-+NETBSD_BLUETOOTH_CHECK
-+
- AC_ARG_OPENOBEX
-
- AC_OUTPUT(Makefile include/Makefile lib/Makefile apps/Makefile ircp/Makefile doc/Makefile openobex.pc)
diff --git a/comms/openobex/patches/patch-ab b/comms/openobex/patches/patch-ab
deleted file mode 100644
index 414ed134393..00000000000
--- a/comms/openobex/patches/patch-ab
+++ /dev/null
@@ -1,35 +0,0 @@
-$NetBSD: patch-ab,v 1.2 2006/07/09 09:27:52 xtraeme Exp $
-
---- acinclude.m4.orig 2006-06-14 11:11:47.000000000 +0200
-+++ acinclude.m4 2006-07-09 10:33:49.000000000 +0200
-@@ -61,6 +61,17 @@
- AC_SUBST(BLUEZ_LIBS)
- ])
-
-+AC_DEFUN([NETBSD_BLUETOOTH_CHECK], [
-+ AC_CACHE_CHECK([for NetBSD bluetooth support], netbsdbt_found,[
-+
-+ AC_TRY_COMPILE([
-+ #include <bluetooth.h>
-+ ], [
-+ struct sockaddr_bt *bt;
-+ ], netbsdbt_found=yes, netbsdbt_found=no)
-+ ])
-+])
-+
- AC_DEFUN([AC_PATH_USB], [
- PKG_CHECK_MODULES(USB, libusb, usb_found=yes, AC_MSG_RESULT(no))
- AC_SUBST(USB_CFLAGS)
-@@ -126,6 +137,12 @@
- REQUIRES="bluez"
- fi
-
-+ if (test "${bluetooth_enable}" = "yes" && test "${netbsdbt_found}" = "yes"); then
-+ AC_DEFINE(HAVE_BLUETOOTH, 1, [Define if system supports Bluetooth and it's enabled])
-+ AC_DEFINE(HAVE_NETBSD_BLUETOOTH, 1, [Define if it uses NetBSD's bluetooth stack])
-+ CPPFLAGS="$CPPFLAGS -DCOMPAT_BLUEZ"
-+ fi
-+
- if (test "${usb_enable}" = "yes" && test "${usb_found}" = "yes"); then
- AC_DEFINE(HAVE_USB, 1, [Define if system supports USB and it's enabled])
- AC_CHECK_FILE(${prefix}/lib/pkgconfig/libusb.pc, REQUIRES="$REQUIRES libusb")
diff --git a/comms/openobex/patches/patch-ac b/comms/openobex/patches/patch-ac
deleted file mode 100644
index 5b78c48a94e..00000000000
--- a/comms/openobex/patches/patch-ac
+++ /dev/null
@@ -1,27 +0,0 @@
-$NetBSD: patch-ac,v 1.2 2006/07/09 09:27:52 xtraeme Exp $
-
---- lib/obex_transport.h.orig 2006-07-09 10:19:01.000000000 +0200
-+++ lib/obex_transport.h 2006-07-09 10:20:53.000000000 +0200
-@@ -39,7 +39,10 @@
- #ifdef HAVE_IRDA
- #include "irda_wrap.h"
- #endif /*HAVE_IRDA*/
--#ifdef HAVE_BLUETOOTH
-+#ifdef HAVE_NETBSD_BLUETOOTH
-+#include <bluetooth.h>
-+#include <netbt/rfcomm.h>
-+#elif defined(HAVE_BLUETOOTH)
- #include <bluetooth/bluetooth.h>
- #include <bluetooth/rfcomm.h>
- #endif /*HAVE_BLUETOOTH*/
-@@ -54,7 +57,9 @@
- struct sockaddr_irda irda;
- #endif /*HAVE_IRDA*/
- struct sockaddr_in inet;
--#ifdef HAVE_BLUETOOTH
-+#ifdef HAVE_NETBSD_BLUETOOTH
-+ struct sockaddr_bt rfcomm;
-+#elif defined(HAVE_BLUETOOTH)
- struct sockaddr_rc rfcomm;
- #endif /*HAVE_BLUETOOTH*/
- #ifdef HAVE_USB
diff --git a/comms/openobex/patches/patch-ad b/comms/openobex/patches/patch-ad
deleted file mode 100644
index 84529e65807..00000000000
--- a/comms/openobex/patches/patch-ad
+++ /dev/null
@@ -1,14 +0,0 @@
-$NetBSD: patch-ad,v 1.2 2006/07/09 09:27:52 xtraeme Exp $
-
---- config.h.in.orig 2006-07-09 10:27:25.000000000 +0200
-+++ config.h.in 2006-07-09 10:28:00.000000000 +0200
-@@ -6,6 +6,9 @@
- /* Define if system supports Bluetooth and it's enabled */
- #undef HAVE_BLUETOOTH
-
-+/* Define if system uses NetBSD's bluetooth stack */
-+#undef HAVE_NETBSD_BLUETOOTH
-+
- /* Define to 1 if you have the <dlfcn.h> header file. */
- #undef HAVE_DLFCN_H
-
diff --git a/comms/openobex/patches/patch-ae b/comms/openobex/patches/patch-ae
deleted file mode 100644
index f591f056e0c..00000000000
--- a/comms/openobex/patches/patch-ae
+++ /dev/null
@@ -1,15 +0,0 @@
-$NetBSD: patch-ae,v 1.2 2006/07/09 09:27:52 xtraeme Exp $
-
---- lib/obex_main.c.orig 2006-07-09 10:34:51.000000000 +0200
-+++ lib/obex_main.c 2006-07-09 10:35:37.000000000 +0200
-@@ -45,7 +45,9 @@
- #include <sys/types.h>
- #include <stdio.h>
-
--#ifdef HAVE_BLUETOOTH
-+#ifdef HAVE_NETBSD_BLUETOOTH
-+#include <bluetooth.h>
-+#elif defined(HAVE_BLUETOOTH)
- #include <bluetooth/bluetooth.h>
- #endif /*HAVE_BLUETOOTH*/
-
diff --git a/comms/openobex/patches/patch-af b/comms/openobex/patches/patch-af
deleted file mode 100644
index 2adf44218dc..00000000000
--- a/comms/openobex/patches/patch-af
+++ /dev/null
@@ -1,31 +0,0 @@
-$NetBSD: patch-af,v 1.3 2006/07/09 09:27:52 xtraeme Exp $
-
---- lib/btobex.c.orig 2006-07-09 10:36:43.000000000 +0200
-+++ lib/btobex.c 2006-07-09 10:38:51.000000000 +0200
-@@ -37,7 +37,7 @@
- #include <winsock.h>
-
- #else /* _WIN32 */
--/* Linux case */
-+/* Linux/NetBSD case */
-
- #include <string.h>
- #include <unistd.h>
-@@ -46,8 +46,17 @@
- #include <netinet/in.h>
- #include <sys/socket.h>
-
-+#ifdef HAVE_NETBSD_BLUETOOTH
-+#define rc_family bt_family
-+#define rc_bdaddr bt_bdaddr
-+#define rc_channel bt_channel
-+#define sockaddr_rc sockaddr_bt
-+#include <bluetooth.h>
-+#include <netbt/rfcomm.h>
-+#else
- #include <bluetooth/bluetooth.h>
- #include <bluetooth/rfcomm.h>
-+#endif
-
- #endif /* _WIN32 */
-
diff --git a/comms/openobex/patches/patch-ag b/comms/openobex/patches/patch-ag
new file mode 100644
index 00000000000..c98d8a4d63c
--- /dev/null
+++ b/comms/openobex/patches/patch-ag
@@ -0,0 +1,24 @@
+$NetBSD: patch-ag,v 1.1 2009/08/07 12:18:33 plunky Exp $
+
+fix BSD bluetooth support (this is submitted upstream)
+
+--- lib/bluez_compat.h.orig 2009-02-08 18:30:23.000000000 +0000
++++ lib/bluez_compat.h
+@@ -53,6 +53,8 @@ static bdaddr_t bluez_compat_bdaddr_any
+ #define rc_family rfcomm_family
+ #define rc_bdaddr rfcomm_bdaddr
+ #define rc_channel rfcomm_channel
++#define BDADDR_ANY NG_HCI_BDADDR_ANY
++#define BTPROTO_RFCOMM BLUETOOTH_PROTO_RFCOMM
+
+ #elif defined(HAVE_BLUETOOTH_NETBSD)
+ #include <bluetooth.h>
+@@ -61,7 +63,7 @@ static bdaddr_t bluez_compat_bdaddr_any
+ #define rc_family bt_family
+ #define rc_bdaddr bt_bdaddr
+ #define rc_channel bt_channel
+-#define BDADDR_ANY NG_HCI_BDADDR_ANY
++#define bacpy(dst,src) memcpy((dst),(src),sizeof(bdaddr_t))
+
+ #endif /* HAVE_BLUETOOTH_* */
+
generated by cgit v1.2.3 (git 2.39.1) at 2025-03-10 18:10:41 +0000