Date: Sat, 25 Nov 2006 23:29:57 +0200 From: Matthew West <mwest@uct.ac.za> To: FreeBSD-gnats-submit@FreeBSD.org Cc: mad@madpilot.net Subject: ports/105854: update: ports/comms/openobex from 1.0.1 to 1.3 Message-ID: <E1Go55x-000Luv-RZ@casper2.cs.uct.ac.za> Resent-Message-ID: <200611252140.kAPLe9E7057808@freefall.freebsd.org>
next in thread | raw e-mail | index | archive | help
>Number: 105854
>Category: ports
>Synopsis: update: ports/comms/openobex from 1.0.1 to 1.3
>Confidential: no
>Severity: non-critical
>Priority: low
>Responsible: freebsd-ports-bugs
>State: open
>Quarter:
>Keywords:
>Date-Required:
>Class: update
>Submitter-Id: current-users
>Arrival-Date: Sat Nov 25 21:40:08 GMT 2006
>Closed-Date:
>Last-Modified:
>Originator: Matthew West
>Release:
>Organization:
University of Cape Town
>Environment:
>Description:
This patch updates ports/comms/openobex from 1.0.1 to 1.3
>How-To-Repeat:
>Fix:
--- openobex.diff begins here ---
diff -ruN openobex.orig/Makefile openobex/Makefile
--- openobex.orig/Makefile Thu Feb 23 12:34:58 2006
+++ openobex/Makefile Sat Nov 25 23:17:41 2006
@@ -6,8 +6,7 @@
#
PORTNAME= openobex
-PORTVERSION= 1.0.1
-PORTREVISION= 1
+PORTVERSION= 1.3
CATEGORIES= comms net
MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}
MASTER_SITE_SUBDIR= ${PORTNAME}
@@ -15,10 +14,16 @@
MAINTAINER= mad@madpilot.net
COMMENT= Open source implementation of the OBEX protocol
-USE_AUTOTOOLS= automake:14:env autoheader:253 autoconf:253 libtool:15
+USE_AUTOTOOLS= automake:14:env autoheader:259 autoconf:259 libtool:15
USE_GMAKE= yes
INSTALLS_SHLIB= yes
GNU_CONFIGURE= yes
-CONFIGURE_ARGS+= --program-transform-name=""
+CONFIGURE_ARGS+= --program-transform-name="" \
+ --disable-usb
+
+post-configure:
+ @ ${REINPLACE_CMD} -e "s|pkgconfigdir =.*|pkgconfigdir = ${PREFIX}/libdata/pkgconfig|g" \
+ ${WRKSRC}/Makefile.in
+
.include <bsd.port.mk>
diff -ruN openobex.orig/distinfo openobex/distinfo
--- openobex.orig/distinfo Sun Jan 22 10:22:02 2006
+++ openobex/distinfo Sat Nov 25 21:42:31 2006
@@ -1,3 +1,3 @@
-MD5 (openobex-1.0.1.tar.gz) = 3742666bb98259face76be49b73ea89d
-SHA256 (openobex-1.0.1.tar.gz) = 0661c15e8b5786c9a220d0257ca339b14fbde174e9eb45962ee605bdfa4d9ed8
-SIZE (openobex-1.0.1.tar.gz) = 211696
+MD5 (openobex-1.3.tar.gz) = feaa5dfe5151c0e70e8f868fa4648a43
+SHA256 (openobex-1.3.tar.gz) = 3a80ba2524c66a46db3ac17a788a759015a1f79de6a495fcdf3a316e19fe7c23
+SIZE (openobex-1.3.tar.gz) = 337614
diff -ruN openobex.orig/files/patch-aclocal.m4 openobex/files/patch-aclocal.m4
--- openobex.orig/files/patch-aclocal.m4 Thu Jul 22 17:29:22 2004
+++ openobex/files/patch-aclocal.m4 Sat Nov 25 21:56:00 2006
@@ -1,9 +1,10 @@
---- aclocal.m4.orig Wed Jun 16 19:59:04 2004
-+++ aclocal.m4 Wed Jun 16 20:26:17 2004
-@@ -67,6 +67,36 @@
- BLUETOOTH_HOOK([],failure)
- ])
+--- aclocal.m4.orig Wed Jun 14 15:58:25 2006
++++ aclocal.m4 Sat Nov 25 21:55:24 2006
+@@ -6914,6 +6914,37 @@
+ # AM_CONFIG_HEADER is obsolete. It has been replaced by AC_CONFIG_HEADERS.
+ AU_DEFUN([AM_CONFIG_HEADER], [AC_CONFIG_HEADERS($@)])
++
+dnl adding a check for FreeBSD blutooth netgraph support.
+
+AC_DEFUN([FREEBSD_BLUETOOTH_HOOK],[
@@ -34,6 +35,6 @@
+ FREEBSD_BLUETOOTH_HOOK([],failure)
+])
+
- # Do all the work for Automake. This macro actually does too much --
- # some checks are only needed if your package does certain things.
- # But this isn't really a big deal.
+ # Do all the work for Automake. -*- Autoconf -*-
+
+ # Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005
diff -ruN openobex.orig/files/patch-configure.in openobex/files/patch-configure.in
--- openobex.orig/files/patch-configure.in Wed Nov 24 11:41:03 2004
+++ openobex/files/patch-configure.in Sat Nov 25 21:57:25 2006
@@ -1,16 +1,10 @@
---- configure.in.orig Wed Oct 1 13:17:13 2003
-+++ configure.in Sat Nov 20 03:25:29 2004
-@@ -39,12 +39,12 @@
-
- IRDA_CHECK
- BLUETOOTH_CHECK
+--- configure.in.orig Wed Jun 14 11:24:13 2006
++++ configure.in Sat Nov 25 21:56:52 2006
+@@ -22,6 +22,7 @@
+ AC_PATH_IRDA
+ AC_PATH_BLUEZ
+ AC_PATH_USB
+FREEBSD_BLUETOOTH_CHECK
- dnl Configure debug facilities
- AC_ARG_WITH(debug,[ --with-debug=level Debug level],
- debug_level="$withval", debug_level="")
+ AC_ARG_OPENOBEX
--CFLAGS="-O2"
- if test "$debug_level" != ""; then
- AC_DEFINE_UNQUOTED([OBEX_DEBUG],$debug_level, [debug level])
- CFLAGS="-g -O1"
diff -ruN openobex.orig/files/patch-lib-btobex.c openobex/files/patch-lib-btobex.c
--- openobex.orig/files/patch-lib-btobex.c Thu Jan 1 02:00:00 1970
+++ openobex/files/patch-lib-btobex.c Sat Nov 25 22:00:54 2006
@@ -0,0 +1,110 @@
+--- lib/btobex.c.orig Tue Jan 3 20:36:15 2006
++++ lib/btobex.c Sat Nov 25 22:00:13 2006
+@@ -46,8 +46,12 @@
+ #include <netinet/in.h>
+ #include <sys/socket.h>
+
++#ifdef HAVE_BLUETOOTH_NETGRAPH
++#include <bluetooth.h>
++#else /*HAVE_BLUETOOTH_NETGRAPH*/
+ #include <bluetooth/bluetooth.h>
+ #include <bluetooth/rfcomm.h>
++#endif /*HAVE_BLUETOOTH_NETGRAPH*/
+
+ #endif /* _WIN32 */
+
+@@ -63,6 +67,15 @@
+ void btobex_prepare_connect(obex_t *self, bdaddr_t *src, bdaddr_t *dst, uint8_t channel)
+ {
+ #ifndef _WIN32
++#ifdef HAVE_BLUETOOTH_NETGRAPH
++ self->trans.self.rfcomm.rfcomm_family = AF_BLUETOOTH;
++ bacpy(&self->trans.self.rfcomm.rfcomm_bdaddr, src);
++ self->trans.self.rfcomm.rfcomm_channel = 0;
++
++ self->trans.peer.rfcomm.rfcomm_family = AF_BLUETOOTH;
++ bacpy(&self->trans.peer.rfcomm.rfcomm_bdaddr, dst);
++ self->trans.peer.rfcomm.rfcomm_channel = channel;
++#else /*HAVE_BLUETOOTH_NETGRAPH*/
+ self->trans.self.rfcomm.rc_family = AF_BLUETOOTH;
+ bacpy(&self->trans.self.rfcomm.rc_bdaddr, src);
+ self->trans.self.rfcomm.rc_channel = 0;
+@@ -70,6 +83,7 @@
+ self->trans.peer.rfcomm.rc_family = AF_BLUETOOTH;
+ bacpy(&self->trans.peer.rfcomm.rc_bdaddr, dst);
+ self->trans.peer.rfcomm.rc_channel = channel;
++#endif /*HAVE_BLUETOOTH_NETGRAPH*/
+ #endif /* _WIN32 */
+ }
+
+@@ -83,9 +97,15 @@
+ {
+ #ifndef _WIN32
+ /* Bind local service */
++#ifdef HAVE_BLUETOOTH_NETGRAPH
++ self->trans.self.rfcomm.rfcomm_family = AF_BLUETOOTH;
++ bacpy(&self->trans.self.rfcomm.rfcomm_bdaddr, src);
++ self->trans.self.rfcomm.rfcomm_channel = channel;
++#else /*HAVE_BLUETOOTH_NETGRAPH*/
+ self->trans.self.rfcomm.rc_family = AF_BLUETOOTH;
+ bacpy(&self->trans.self.rfcomm.rc_bdaddr, src);
+ self->trans.self.rfcomm.rc_channel = channel;
++#endif /*HAVE_BLUETOOTH_NETGRAPH*/
+ #endif /* _WIN32 */
+ }
+
+@@ -106,9 +126,15 @@
+ return -1;
+ }
+
++#ifdef HAVE_BLUETOOTH_NETGRAPH
++ if (bind(self->serverfd, (struct sockaddr*) &self->trans.self.rfcomm,
++ sizeof(struct sockaddr_rfcomm)))
++ {
++#else /*HAVE_BLUETOOTH_NETGRAPH*/
+ if (bind(self->serverfd, (struct sockaddr*) &self->trans.self.rfcomm,
+ sizeof(struct sockaddr_rc)))
+ {
++#endif /*HAVE_BLUETOOTH_NETGRAPH*/
+ DEBUG(0, "Error doing bind\n");
+ goto out_freesock;
+ }
+@@ -140,7 +166,11 @@
+ int btobex_accept(obex_t *self)
+ {
+ #ifndef _WIN32
++#ifdef HAVE_BLUETOOTH_NETGRAPH
++ socklen_t addrlen = sizeof(struct sockaddr_rfcomm);
++#else /*HAVE_BLUETOOTH_NETGRAPH*/
+ socklen_t addrlen = sizeof(struct sockaddr_rc);
++#endif /*HAVE_BLUETOOTH_NETGRAPH*/
+ //int mtu;
+ //int len = sizeof(int);
+
+@@ -178,16 +208,26 @@
+ return -1;
+ }
+
++#ifdef HAVE_BLUETOOTH_NETGRAPH
++ ret = bind(self->fd, (struct sockaddr*) &self->trans.self.rfcomm,
++ sizeof(struct sockaddr_rfcomm));
++#else /*HAVE_BLUETOOTH_NETGRAPH*/
+ ret = bind(self->fd, (struct sockaddr*) &self->trans.self.rfcomm,
+ sizeof(struct sockaddr_rc));
++#endif /*HAVE_BLUETOOTH_NETGRAPH*/
+
+ if (ret < 0) {
+ DEBUG(4, "ret=%d\n", ret);
+ goto out_freesock;
+ }
+
++#ifdef HAVE_BLUETOOTH_NETGRAPH
++ ret = connect(self->fd, (struct sockaddr*) &self->trans.peer.rfcomm,
++ sizeof(struct sockaddr_rfcomm));
++#else /*HAVE_BLUETOOTH_NETGRAPH*/
+ ret = connect(self->fd, (struct sockaddr*) &self->trans.peer.rfcomm,
+ sizeof(struct sockaddr_rc));
++#endif /*HAVE_BLUETOOTH_NETGRAPH*/
+ if (ret < 0) {
+ DEBUG(4, "ret=%d\n", ret);
+ goto out_freesock;
diff -ruN openobex.orig/files/patch-lib-databuffer.h openobex/files/patch-lib-databuffer.h
--- openobex.orig/files/patch-lib-databuffer.h Thu Jan 1 02:00:00 1970
+++ openobex/files/patch-lib-databuffer.h Sat Nov 25 22:03:16 2006
@@ -0,0 +1,11 @@
+--- lib/databuffer.h.orig Thu May 4 13:24:21 2006
++++ lib/databuffer.h Sat Nov 25 22:02:38 2006
+@@ -31,7 +31,7 @@
+ #define DATABUFFER_H
+
+ #define __need_size_t
+-#include <stddef.h>
++#include <sys/types.h>
+ #include <stdint.h>
+
+ /*
diff -ruN openobex.orig/files/patch-lib-obex.c openobex/files/patch-lib-obex.c
--- openobex.orig/files/patch-lib-obex.c Thu Jan 1 02:00:00 1970
+++ openobex/files/patch-lib-obex.c Sat Nov 25 22:04:39 2006
@@ -0,0 +1,26 @@
+--- lib/obex.c.orig Thu May 25 20:09:41 2006
++++ lib/obex.c Sat Nov 25 22:04:07 2006
+@@ -1031,7 +1031,11 @@
+
+ #ifdef HAVE_BLUETOOTH
+ if(src == NULL)
++#ifdef HAVE_BLUETOOTH_NETGRAPH
++ src = NG_HCI_BDADDR_ANY;
++#else /*HAVE_BLUETOOTH_NETGRAPH*/
+ src = BDADDR_ANY;
++#endif /*HAVE_BLUETOOTH_NETGRAPH*/
+ btobex_prepare_listen(self, src, channel);
+ return obex_transport_listen(self);
+ #else
+@@ -1061,7 +1065,11 @@
+
+ #ifdef HAVE_BLUETOOTH
+ if(src == NULL)
++#ifdef HAVE_BLUETOOTH_NETGRAPH
++ src = NG_HCI_BDADDR_ANY;
++#else /*HAVE_BLUETOOTH_NETGRAPH*/
+ src = BDADDR_ANY;
++#endif /*HAVE_BLUETOOTH_NETGRAPH*/
+ btobex_prepare_connect(self, src, dst, channel);
+ return obex_transport_connect_request(self);
+ #else
diff -ruN openobex.orig/files/patch-lib-obex_main.c openobex/files/patch-lib-obex_main.c
--- openobex.orig/files/patch-lib-obex_main.c Thu Jan 1 02:00:00 1970
+++ openobex/files/patch-lib-obex_main.c Sat Nov 25 22:33:28 2006
@@ -0,0 +1,26 @@
+--- lib/obex_main.c.orig Thu May 4 13:24:21 2006
++++ lib/obex_main.c Sat Nov 25 22:32:59 2006
+@@ -46,7 +46,11 @@
+ #include <stdio.h>
+
+ #ifdef HAVE_BLUETOOTH
++#ifdef HAVE_BLUETOOTH_NETGRAPH
++#include <bluetooth.h>
++#else /*HAVE_BLUETOOTH_NETGRAPH*/
+ #include <bluetooth/bluetooth.h>
++#endif /*HAVE_BLUETOOTH_NETGRAPH*/
+ #endif /*HAVE_BLUETOOTH*/
+
+ #endif /* _WIN32 */
+@@ -80,7 +84,11 @@
+
+ #ifdef HAVE_BLUETOOTH
+ if (domain == AF_BLUETOOTH)
++#ifdef HAVE_BLUETOOTH_NETGRAPH
++ proto = BLUETOOTH_PROTO_RFCOMM;
++#else /*HAVE_BLUETOOTH_NETGRAPH*/
+ proto = BTPROTO_RFCOMM;
++#endif /*HAVE_BLUETOOTH_NETGRAPH*/
+ #endif /*HAVE_BLUETOOTH*/
+
+ fd = socket(domain, SOCK_STREAM, proto);
diff -ruN openobex.orig/files/patch-lib-obex_transport.h openobex/files/patch-lib-obex_transport.h
--- openobex.orig/files/patch-lib-obex_transport.h Thu Jan 1 02:00:00 1970
+++ openobex/files/patch-lib-obex_transport.h Sat Nov 25 22:34:57 2006
@@ -0,0 +1,27 @@
+--- lib/obex_transport.h.orig Thu May 4 13:24:21 2006
++++ lib/obex_transport.h Sat Nov 25 22:34:03 2006
+@@ -40,8 +40,12 @@
+ #include "irda_wrap.h"
+ #endif /*HAVE_IRDA*/
+ #ifdef HAVE_BLUETOOTH
++#ifdef HAVE_BLUETOOTH_NETGRAPH
++#include <bluetooth.h>
++#else /*HAVE_BLUETOOTH_NETGRAPH*/
+ #include <bluetooth/bluetooth.h>
+ #include <bluetooth/rfcomm.h>
++#endif /*HAVE_BLUETOOTH_NETGRAPH*/
+ #endif /*HAVE_BLUETOOTH*/
+ #ifdef HAVE_USB
+ #include "usbobex.h"
+@@ -55,7 +59,11 @@
+ #endif /*HAVE_IRDA*/
+ struct sockaddr_in inet;
+ #ifdef HAVE_BLUETOOTH
++#ifdef HAVE_BLUETOOTH_NETGRAPH
++ struct sockaddr_rfcomm rfcomm;
++#else /*HAVE_BLUETOOTH_NETGRAPH*/
+ struct sockaddr_rc rfcomm;
++#endif /*HAVE_BLUETOOTH_NETGRAPH*/
+ #endif /*HAVE_BLUETOOTH*/
+ #ifdef HAVE_USB
+ struct obex_usb_intf_transport_t usb;
diff -ruN openobex.orig/files/patch-src-btobex.c openobex/files/patch-src-btobex.c
--- openobex.orig/files/patch-src-btobex.c Tue Mar 23 21:57:59 2004
+++ openobex/files/patch-src-btobex.c Thu Jan 1 02:00:00 1970
@@ -1,110 +0,0 @@
---- src/btobex.c.orig Mon Mar 22 18:31:43 2004
-+++ src/btobex.c Mon Mar 22 18:44:46 2004
-@@ -46,8 +46,12 @@
- #include <netinet/in.h>
- #include <sys/socket.h>
-
-+#ifdef HAVE_BLUETOOTH_NETGRAPH
-+#include <bluetooth.h>
-+#else /*HAVE_BLUETOOTH_NETGRAPH*/
- #include <bluetooth/bluetooth.h>
- #include <bluetooth/rfcomm.h>
-+#endif /*HAVE_BLUETOOTH_NETGRAPH*/
-
- #endif /* _WIN32 */
-
-@@ -65,6 +69,15 @@
- void btobex_prepare_connect(obex_t *self, bdaddr_t *src, bdaddr_t *dst, uint8_t channel)
- {
- #ifndef _WIN32
-+#ifdef HAVE_BLUETOOTH_NETGRAPH
-+ self->trans.self.rfcomm.rfcomm_family = AF_BLUETOOTH;
-+ bacpy(&self->trans.self.rfcomm.rfcomm_bdaddr, src);
-+ self->trans.self.rfcomm.rfcomm_channel = 0;
-+
-+ self->trans.peer.rfcomm.rfcomm_family = AF_BLUETOOTH;
-+ bacpy(&self->trans.peer.rfcomm.rfcomm_bdaddr, dst);
-+ self->trans.peer.rfcomm.rfcomm_channel = channel;
-+#else /*HAVE_BLUETOOTH_NETGRAPH*/
- self->trans.self.rfcomm.rc_family = AF_BLUETOOTH;
- bacpy(&self->trans.self.rfcomm.rc_bdaddr, src);
- self->trans.self.rfcomm.rc_channel = 0;
-@@ -72,6 +85,7 @@
- self->trans.peer.rfcomm.rc_family = AF_BLUETOOTH;
- bacpy(&self->trans.peer.rfcomm.rc_bdaddr, dst);
- self->trans.peer.rfcomm.rc_channel = channel;
-+#endif /*HAVE_BLUETOOTH_NETGRAPH*/
- #endif /* _WIN32 */
- }
-
-@@ -85,9 +99,15 @@
- {
- #ifndef _WIN32
- /* Bind local service */
-+#ifdef HAVE_BLUETOOTH_NETGRAPH
-+ self->trans.self.rfcomm.rfcomm_family = AF_BLUETOOTH;
-+ bacpy(&self->trans.self.rfcomm.rfcomm_bdaddr, src);
-+ self->trans.self.rfcomm.rfcomm_channel = channel;
-+#else /*HAVE_BLUETOOTH_NETGRAPH*/
- self->trans.self.rfcomm.rc_family = AF_BLUETOOTH;
- bacpy(&self->trans.self.rfcomm.rc_bdaddr, src);
- self->trans.self.rfcomm.rc_channel = channel;
-+#endif /*HAVE_BLUETOOTH_NETGRAPH*/
- #endif /* _WIN32 */
- }
-
-@@ -108,9 +128,15 @@
- return -1;
- }
-
-+#ifdef HAVE_BLUETOOTH_NETGRAPH
-+ if (bind(self->serverfd, (struct sockaddr*) &self->trans.self.rfcomm,
-+ sizeof(struct sockaddr_rfcomm)))
-+ {
-+#else /*HAVE_BLUETOOTH_NETGRAPH*/
- if (bind(self->serverfd, (struct sockaddr*) &self->trans.self.rfcomm,
- sizeof(struct sockaddr_rc)))
- {
-+#endif /*HAVE_BLUETOOTH_NETGRAPH*/
- DEBUG(0, "Error doing bind\n");
- goto out_freesock;
- }
-@@ -142,7 +168,11 @@
- int btobex_accept(obex_t *self)
- {
- #ifndef _WIN32
-+#ifdef HAVE_BLUETOOTH_NETGRAPH
-+ int addrlen = sizeof(struct sockaddr_rfcomm);
-+#else /*HAVE_BLUETOOTH_NETGRAPH*/
- int addrlen = sizeof(struct sockaddr_rc);
-+#endif /*HAVE_BLUETOOTH_NETGRAPH*/
- //int mtu;
- //int len = sizeof(int);
-
-@@ -180,16 +210,26 @@
- return -1;
- }
-
-+#ifdef HAVE_BLUETOOTH_NETGRAPH
-+ ret = bind(self->fd, (struct sockaddr*) &self->trans.self.rfcomm,
-+ sizeof(struct sockaddr_rfcomm));
-+#else /*HAVE_BLUETOOTH_NETGRAPH*/
- ret = bind(self->fd, (struct sockaddr*) &self->trans.self.rfcomm,
- sizeof(struct sockaddr_rc));
-+#endif /*HAVE_BLUETOOTH_NETGRAPH*/
-
- if (ret < 0) {
- DEBUG(4, "ret=%d\n", ret);
- goto out_freesock;
- }
-
-+#ifdef HAVE_BLUETOOTH_NETGRAPH
-+ ret = connect(self->fd, (struct sockaddr*) &self->trans.peer.rfcomm,
-+ sizeof(struct sockaddr_rfcomm));
-+#else /*HAVE_BLUETOOTH_NETGRAPH*/
- ret = connect(self->fd, (struct sockaddr*) &self->trans.peer.rfcomm,
- sizeof(struct sockaddr_rc));
-+#endif /*HAVE_BLUETOOTH_NETGRAPH*/
- if (ret < 0) {
- DEBUG(4, "ret=%d\n", ret);
- goto out_freesock;
diff -ruN openobex.orig/files/patch-src-netbuf.h openobex/files/patch-src-netbuf.h
--- openobex.orig/files/patch-src-netbuf.h Tue Mar 23 21:57:59 2004
+++ openobex/files/patch-src-netbuf.h Thu Jan 1 02:00:00 1970
@@ -1,11 +0,0 @@
---- src/netbuf.h.orig Wed Oct 1 13:17:13 2003
-+++ src/netbuf.h Mon Mar 22 10:47:07 2004
-@@ -37,7 +37,7 @@
- #ifndef G_NETBUF_H
- #define G_NETBUF_H
-
--#include <stdint.h>
-+#include <sys/types.h>
-
- typedef struct _slist_t{
- void *data;
diff -ruN openobex.orig/files/patch-src-obex.c openobex/files/patch-src-obex.c
--- openobex.orig/files/patch-src-obex.c Tue Mar 23 21:57:59 2004
+++ openobex/files/patch-src-obex.c Thu Jan 1 02:00:00 1970
@@ -1,26 +0,0 @@
---- src/obex.c.orig Mon Mar 22 18:16:53 2004
-+++ src/obex.c Mon Mar 22 18:21:35 2004
-@@ -990,7 +990,11 @@
-
- #ifdef HAVE_BLUETOOTH
- if(src == NULL)
-+#ifdef HAVE_BLUETOOTH_NETGRAPH
-+ src = NG_HCI_BDADDR_ANY;
-+#else /*HAVE_BLUETOOTH_NETGRAPH*/
- src = BDADDR_ANY;
-+#endif /*HAVE_BLUETOOTH_NETGRAPH*/
- btobex_prepare_listen(self, src, channel);
- return obex_transport_listen(self);
- #else
-@@ -1019,7 +1023,11 @@
-
- #ifdef HAVE_BLUETOOTH
- if(src == NULL)
-+#ifdef HAVE_BLUETOOTH_NETGRAPH
-+ src = NG_HCI_BDADDR_ANY;
-+#else /*HAVE_BLUETOOTH_NETGRAPH*/
- src = BDADDR_ANY;
-+#endif /*HAVE_BLUETOOTH_NETGRAPH*/
- btobex_prepare_connect(self, src, dst, channel);
- return obex_transport_connect_request(self);
- #else
diff -ruN openobex.orig/files/patch-src-obex.h openobex/files/patch-src-obex.h
--- openobex.orig/files/patch-src-obex.h Tue Mar 23 21:57:59 2004
+++ openobex/files/patch-src-obex.h Thu Jan 1 02:00:00 1970
@@ -1,11 +0,0 @@
---- src/obex.h.orig Wed Oct 1 13:17:13 2003
-+++ src/obex.h Mon Mar 22 11:11:11 2004
-@@ -30,7 +30,7 @@
- #ifndef OBEX_H
- #define OBEX_H
-
--#include <stdint.h>
-+#include <sys/types.h>
-
- #ifdef _WIN32
- #include <winsock.h>
diff -ruN openobex.orig/files/patch-src-obex_const.h openobex/files/patch-src-obex_const.h
--- openobex.orig/files/patch-src-obex_const.h Tue Mar 23 21:57:59 2004
+++ openobex/files/patch-src-obex_const.h Thu Jan 1 02:00:00 1970
@@ -1,11 +0,0 @@
---- src/obex_const.h.orig Wed Oct 1 13:17:13 2003
-+++ src/obex_const.h Mon Mar 22 10:44:58 2004
-@@ -30,8 +30,6 @@
- #ifndef OBEX_CONST_H
- #define OBEX_CONST_H
-
--#include <stdint.h>
--
- typedef union {
- uint32_t bq4;
- uint8_t bq1;
diff -ruN openobex.orig/files/patch-src-obex_main.c openobex/files/patch-src-obex_main.c
--- openobex.orig/files/patch-src-obex_main.c Tue Mar 23 21:57:59 2004
+++ openobex/files/patch-src-obex_main.c Thu Jan 1 02:00:00 1970
@@ -1,26 +0,0 @@
---- src/obex_main.c.orig Mon Mar 22 18:25:05 2004
-+++ src/obex_main.c Mon Mar 22 18:27:55 2004
-@@ -46,7 +46,11 @@
- #include <stdio.h>
-
- #ifdef HAVE_BLUETOOTH
-+#ifdef HAVE_BLUETOOTH_NETGRAPH
-+#include <bluetooth.h>
-+#else /*HAVE_BLUETOOTH_NETGRAPH*/
- #include <bluetooth/bluetooth.h>
-+#endif /*HAVE_BLUETOOTH_NETGRAPH*/
- #endif /*HAVE_BLUETOOTH*/
-
- #endif /* _WIN32 */
-@@ -79,7 +83,11 @@
-
- #ifdef HAVE_BLUETOOTH
- if (domain == AF_BLUETOOTH)
-+#ifdef HAVE_BLUETOOTH_NETGRAPH
-+ proto = BLUETOOTH_PROTO_RFCOMM;
-+#else /*HAVE_BLUETOOTH_NETGRAPH*/
- proto = BTPROTO_RFCOMM;
-+#endif /*HAVE_BLUETOOTH_NETGRAPH*/
- #endif /*HAVE_BLUETOOTH*/
-
- fd = socket(domain, SOCK_STREAM, proto);
diff -ruN openobex.orig/files/patch-src-obex_transport.h openobex/files/patch-src-obex_transport.h
--- openobex.orig/files/patch-src-obex_transport.h Tue Mar 23 21:57:59 2004
+++ openobex/files/patch-src-obex_transport.h Thu Jan 1 02:00:00 1970
@@ -1,36 +0,0 @@
---- src/obex_transport.h.orig Mon Mar 22 18:02:08 2004
-+++ src/obex_transport.h Mon Mar 22 18:05:08 2004
-@@ -40,8 +40,12 @@
- #include "irda_wrap.h"
- #endif /*HAVE_IRDA*/
- #ifdef HAVE_BLUETOOTH
-+#ifdef HAVE_BLUETOOTH_NETGRAPH
-+#include <bluetooth.h>
-+#else /*HAVE_BLUETOOTH_NETGRAPH*/
- #include <bluetooth/bluetooth.h>
- #include <bluetooth/rfcomm.h>
-+#endif /*HAVE_BLUETOOTH_NETGRAPH*/
- #endif /*HAVE_BLUETOOTH*/
-
- #include "obex_main.h"
-@@ -52,7 +56,11 @@
- #endif /*HAVE_IRDA*/
- struct sockaddr_in inet;
- #ifdef HAVE_BLUETOOTH
-+#ifdef HAVE_BLUETOOTH_NETGRAPH
-+ struct sockaddr_rfcomm rfcomm;
-+#else /*HAVE_BLUETOOTH_NETGRAPH*/
- struct sockaddr_rc rfcomm;
-+#endif /*HAVE_BLUETOOTH_NETGRAPH*/
- #endif /*HAVE_BLUETOOTH*/
- } saddr_t;
-
-@@ -76,7 +84,4 @@
- int obex_transport_read(obex_t *self, int count, uint8_t *buf, int buflen);
-
-
--#endif OBEX_TRANSPORT_H
--
--
--
-+#endif /*OBEX_TRANSPORT_H*/
diff -ruN openobex.orig/pkg-plist openobex/pkg-plist
--- openobex.orig/pkg-plist Thu Feb 23 12:34:58 2006
+++ openobex/pkg-plist Sat Nov 25 23:18:28 2006
@@ -1,10 +1,9 @@
-bin/openobex-config
include/openobex/obex.h
include/openobex/obex_const.h
-lib/libopenobex-1.0.so
-lib/libopenobex-1.0.so.1
+lib/libopenobex.so.4
lib/libopenobex.a
lib/libopenobex.la
lib/libopenobex.so
+libdata/pkgconfig/openobex.pc
share/aclocal/openobex.m4
@dirrm include/openobex
--- openobex.diff ends here ---
>Release-Note:
>Audit-Trail:
>Unformatted:
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?E1Go55x-000Luv-RZ>