Fri Aug 7 12:18:33 2009 UTC ()
update to openobex 1.5,

Bluetooth detection on BSD is much improved so the patches are no longer
required. They got it wrong though, so one patch added (I also fed that
upstream)

while here,
	include LICENSE=gnu-lgpl-v2
	update HOMEPAGE=http://www.openobex.org/


(plunky)
diff -r1.17 -r1.18 pkgsrc/comms/openobex/Makefile
diff -r1.4 -r1.5 pkgsrc/comms/openobex/PLIST
diff -r1.11 -r1.12 pkgsrc/comms/openobex/buildlink3.mk
diff -r1.5 -r1.6 pkgsrc/comms/openobex/distinfo
diff -r1.2 -r0 pkgsrc/comms/openobex/patches/patch-aa
diff -r1.2 -r0 pkgsrc/comms/openobex/patches/patch-ab
diff -r1.2 -r0 pkgsrc/comms/openobex/patches/patch-ac
diff -r1.2 -r0 pkgsrc/comms/openobex/patches/patch-ad
diff -r1.2 -r0 pkgsrc/comms/openobex/patches/patch-ae
diff -r1.3 -r0 pkgsrc/comms/openobex/patches/patch-af
diff -r0 -r1.1 pkgsrc/comms/openobex/patches/patch-ag
cvs diff -r1.17 -r1.18 pkgsrc/comms/openobex/Makefile (expand / switch to unified diff)

--- pkgsrc/comms/openobex/Makefile 2009/03/20 19:42:20 1.17
+++ pkgsrc/comms/openobex/Makefile 2009/08/07 12:18:33 1.18
@@ -1,36 +1,26 @@ @@ -1,36 +1,26 @@
1# $NetBSD: Makefile,v 1.17 2009/03/20 19:42:20 hasso Exp $ 1# $NetBSD: Makefile,v 1.18 2009/08/07 12:18:33 plunky Exp $
2# 2#
3 3
4DISTNAME= openobex-1.3 4DISTNAME= openobex-1.5
5PKGREVISION= 2 
6CATEGORIES= comms 5CATEGORIES= comms
7MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=openobex/} 6MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=openobex/}
8 7
9MAINTAINER= pkgsrc-users@NetBSD.org 8MAINTAINER= pkgsrc-users@NetBSD.org
10HOMEPAGE= http://openobex.triq.net/ 9HOMEPAGE= http://www.openobex.org/
11COMMENT= Implementation of the Object Exchange (OBEX) protocol 10COMMENT= Implementation of the Object Exchange (OBEX) protocol
12 11
 12LICENSE= gnu-lgpl-v2
 13
13PKG_DESTDIR_SUPPORT= user-destdir 14PKG_DESTDIR_SUPPORT= user-destdir
14 15
15GNU_CONFIGURE= yes 16GNU_CONFIGURE= yes
16USE_TOOLS+= autoconf gmake pkg-config 17USE_TOOLS+= autoconf gmake pkg-config
17USE_LIBTOOL= yes 18USE_LIBTOOL= yes
18 19
19PKGCONFIG_OVERRIDE= openobex.pc.in 20PKGCONFIG_OVERRIDE= openobex.pc.in
20 21
21.include "../../mk/bsd.prefs.mk" 
22 
23.if ((${OPSYS} == "NetBSD" && exists(/usr/include/bluetooth.h)) || ${OPSYS} == "DragonFly") 
24SUBST_CLASSES+= bt 
25SUBST_STAGE.bt= post-patch 
26SUBST_FILES.bt= include/obex.h 
27SUBST_SED.bt= -e "s,\#ifndef SOL_RFCOMM,\#if defined(__NetBSD__) || defined(__DragonFly__)," 
28SUBST_SED.bt+= -e "s,typedef char\* bdaddr_t\;,\#include \<bluetooth.h\>," 
29SUBST_MESSAGE.bt= Fixing bluetooth detection. 
30.endif 
31 
32post-patch: 22post-patch:
33 cd ${WRKSRC} && autoconf 23 cd ${WRKSRC} && autoconf
34 24
35.include "../../devel/libusb/buildlink3.mk" 25.include "../../devel/libusb/buildlink3.mk"
36.include "../../mk/bsd.pkg.mk" 26.include "../../mk/bsd.pkg.mk"
cvs diff -r1.4 -r1.5 pkgsrc/comms/openobex/PLIST (expand / switch to unified diff)

--- pkgsrc/comms/openobex/PLIST 2009/06/14 17:38:41 1.4
+++ pkgsrc/comms/openobex/PLIST 2009/08/07 12:18:33 1.5
@@ -1,6 +1,5 @@ @@ -1,6 +1,5 @@
1@comment $NetBSD: PLIST,v 1.4 2009/06/14 17:38:41 joerg Exp $ 1@comment $NetBSD: PLIST,v 1.5 2009/08/07 12:18:33 plunky Exp $
2include/openobex/obex.h 2include/openobex/obex.h
3include/openobex/obex_const.h 3include/openobex/obex_const.h
4lib/libopenobex.la 4lib/libopenobex.la
5lib/pkgconfig/openobex.pc 5lib/pkgconfig/openobex.pc
6share/aclocal/openobex.m4 
cvs diff -r1.11 -r1.12 pkgsrc/comms/openobex/buildlink3.mk (expand / switch to unified diff)

--- pkgsrc/comms/openobex/buildlink3.mk 2009/03/20 19:24:03 1.11
+++ pkgsrc/comms/openobex/buildlink3.mk 2009/08/07 12:18:33 1.12
@@ -1,14 +1,14 @@ @@ -1,14 +1,14 @@
1# $NetBSD: buildlink3.mk,v 1.11 2009/03/20 19:24:03 joerg Exp $ 1# $NetBSD: buildlink3.mk,v 1.12 2009/08/07 12:18:33 plunky Exp $
2 2
3BUILDLINK_TREE+= openobex 3BUILDLINK_TREE+= openobex
4 4
5.if !defined(OPENOBEX_BUILDLINK3_MK) 5.if !defined(OPENOBEX_BUILDLINK3_MK)
6OPENOBEX_BUILDLINK3_MK:= 6OPENOBEX_BUILDLINK3_MK:=
7 7
8BUILDLINK_API_DEPENDS.openobex+= openobex>=1.3 8BUILDLINK_API_DEPENDS.openobex+= openobex>=1.5
9BUILDLINK_PKGSRCDIR.openobex?= ../../comms/openobex 9BUILDLINK_PKGSRCDIR.openobex?= ../../comms/openobex
10 10
11.include "../../devel/libusb/buildlink3.mk" 11.include "../../devel/libusb/buildlink3.mk"
12.endif # OPENOBEX_BUILDLINK3_MK 12.endif # OPENOBEX_BUILDLINK3_MK
13 13
14BUILDLINK_TREE+= -openobex 14BUILDLINK_TREE+= -openobex
cvs diff -r1.5 -r1.6 pkgsrc/comms/openobex/distinfo (expand / switch to unified diff)

--- pkgsrc/comms/openobex/distinfo 2006/07/09 09:27:52 1.5
+++ pkgsrc/comms/openobex/distinfo 2009/08/07 12:18:33 1.6
@@ -1,11 +1,6 @@ @@ -1,11 +1,6 @@
1$NetBSD: distinfo,v 1.5 2006/07/09 09:27:52 xtraeme Exp $ 1$NetBSD: distinfo,v 1.6 2009/08/07 12:18:33 plunky Exp $
2 2
3SHA1 (openobex-1.3.tar.gz) = a6fbb5991bc14b90ba6c42faf026bf6bfa325d7f 3SHA1 (openobex-1.5.tar.gz) = ff5fc07287d67fa73ec55998f76ed73787a2ddb1
4RMD160 (openobex-1.3.tar.gz) = f38474e17aaff1799ecb5f45de6ab23c3bdc8de0 4RMD160 (openobex-1.5.tar.gz) = 9c57faabd6e63ff809e27ab90ed5db788802c45c
5Size (openobex-1.3.tar.gz) = 337614 bytes 5Size (openobex-1.5.tar.gz) = 400876 bytes
6SHA1 (patch-aa) = bc1c17a9f040f2e3c1b82b9b0070026d829e4a21 6SHA1 (patch-ag) = 3276e9836c02e2e7fc56ba819e08c647369b1cff
7SHA1 (patch-ab) = 84f76f808634dbeaed74a69469a91be1322b9bf1 
8SHA1 (patch-ac) = 4e8075984d5a957bfb2fda3b63872063252b7b75 
9SHA1 (patch-ad) = 0aa9962a170716fd93f115ac3bdb7307e31081a1 
10SHA1 (patch-ae) = 9292387331847631b74e1331f50bab247bdb19b0 
11SHA1 (patch-af) = d9a913a695a27f487ba496629bd37a8904c364b4 
File Deleted: pkgsrc/comms/openobex/patches/Attic/patch-aa
File Deleted: pkgsrc/comms/openobex/patches/Attic/patch-ab
File Deleted: pkgsrc/comms/openobex/patches/Attic/patch-ac
File Deleted: pkgsrc/comms/openobex/patches/Attic/patch-ad
File Deleted: pkgsrc/comms/openobex/patches/Attic/patch-ae
File Deleted: pkgsrc/comms/openobex/patches/Attic/patch-af
File Added: pkgsrc/comms/openobex/patches/Attic/patch-ag
$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_* */