bump PKGREVISION for openobex update

fix build for openobex 1.7
add LICENCE
update MASTER_SITE (=sourceforge)

7 files changed, 67 insertions, 20 deletions

diff --git a/comms/libsyncml/Makefile b/comms/libsyncml/Makefile
index 09a4b66e24d..7acf6ac94f0 100644
--- a/comms/libsyncml/Makefile
+++ b/comms/libsyncml/Makefile
@@ -1,15 +1,16 @@
-# $NetBSD: Makefile,v 1.10 2012/12/12 10:44:07 wiz Exp $
+# $NetBSD: Makefile,v 1.11 2013/03/15 08:25:15 plunky Exp $
 #
 
 DISTNAME=	libsyncml-0.4.5
-PKGREVISION=	5
+PKGREVISION=	6
 CATEGORIES=	comms
-MASTER_SITES=	http://libsyncml.opensync.org/download/releases/0.4.5/
+MASTER_SITES=	${MASTER_SITE_SOURCEFORGE:=libsyncml/}
 EXTRACT_SUFX=	.tar.bz2
 
 MAINTAINER=	pkgsrc-users@NetBSD.org
 HOMEPAGE=	http://libsyncml.opensync.org/
 COMMENT=	C library implementation of the SyncML protocol
+LICENSE=	gnu-lgpl-v2.1
 
 GNU_CONFIGURE=	yes
 USE_TOOLS+=	pkg-config
diff --git a/comms/libsyncml/distinfo b/comms/libsyncml/distinfo
index 38db9530b67..2298bbbf631 100644
--- a/comms/libsyncml/distinfo
+++ b/comms/libsyncml/distinfo
@@ -1,9 +1,10 @@
-$NetBSD: distinfo,v 1.1.1.1 2008/01/12 14:09:35 dillo Exp $
+$NetBSD: distinfo,v 1.2 2013/03/15 08:25:15 plunky Exp $
 
 SHA1 (libsyncml-0.4.5.tar.bz2) = 93794fd891def238025559cb74be18669fd5197a
 RMD160 (libsyncml-0.4.5.tar.bz2) = 551f27a5173f7d54ca51d6c01c2d601970eee496
 Size (libsyncml-0.4.5.tar.bz2) = 374803 bytes
-SHA1 (patch-aa) = e610909735c46812f69dfe292293d3e0e0965ee1
-SHA1 (patch-ab) = 2b6fe22c62f324d6d3c894e7271256c3b6e9396f
-SHA1 (patch-ac) = 20179ab5aa95f25e8e9956cdfbd7757fc16f7606
-SHA1 (patch-ad) = 51298b6b0a7b32bb941ef75781f1148ddc03d5a4
+SHA1 (patch-aa) = 5202525fe8988b5d5c543ec2bd9d29d3cfc3f91a
+SHA1 (patch-ab) = 4fd1d4f94decf90746a5e472e04982e0541c385a
+SHA1 (patch-ac) = fea6ab18142bbdd9972568dffe65727473bb77f5
+SHA1 (patch-ad) = c51affb9cf70874c0cf7f0dd383da4a121855b53
+SHA1 (patch-tools_syncml-obex-client.c) = 0d106c30d0a8a9af9cb0f2c33fd43a41f15432a2
diff --git a/comms/libsyncml/patches/patch-aa b/comms/libsyncml/patches/patch-aa
index 2136db273b1..8d87e5099da 100644
--- a/comms/libsyncml/patches/patch-aa
+++ b/comms/libsyncml/patches/patch-aa
@@ -1,8 +1,8 @@
-$NetBSD: patch-aa,v 1.1.1.1 2008/01/12 14:09:35 dillo Exp $
+$NetBSD: patch-aa,v 1.2 2013/03/15 08:25:15 plunky Exp $
 
 Check for -lbluetooth in addition to -lbluez, to make this compile on BSD.
 
---- configure.ac.orig	2007-10-16 14:42:45.000000000 +0200
+--- configure.ac.orig	2007-10-16 12:42:45.000000000 +0000
 +++ configure.ac
 @@ -78,20 +78,27 @@ AC_ARG_ENABLE(bluetooth,
    AS_HELP_STRING([--enable-bluetooth], [enable obex over bluetooth transports]),
diff --git a/comms/libsyncml/patches/patch-ab b/comms/libsyncml/patches/patch-ab
index ee4de7eb8b4..b0d2fdbb52f 100644
--- a/comms/libsyncml/patches/patch-ab
+++ b/comms/libsyncml/patches/patch-ab
@@ -1,6 +1,6 @@
-$NetBSD: patch-ab,v 1.1.1.1 2008/01/12 14:09:35 dillo Exp $
+$NetBSD: patch-ab,v 1.2 2013/03/15 08:25:15 plunky Exp $
 
---- libsyncml/transports/obex_client.c.orig	2007-10-16 15:25:31.000000000 +0200
+--- libsyncml/transports/obex_client.c.orig	2007-10-16 13:25:31.000000000 +0000
 +++ libsyncml/transports/obex_client.c
 @@ -26,7 +26,12 @@
  #include <libsyncml/sml_transport_internals.h>
@@ -15,3 +15,22 @@ $NetBSD: patch-ab,v 1.1.1.1 2008/01/12 14:09:35 dillo Exp $
  #endif
  
  #include "obex_client.h"
+@@ -326,7 +331,7 @@ static void smlTransportObexClientConnec
+ 	} else if (env->type == SML_OBEX_TYPE_USB) {
+ 		smlTrace(TRACE_INTERNAL, "connecting to usb interface %i", env->port);
+ 		
+-		obex_intf_cnt = OBEX_FindInterfaces(env->obexhandle, &obex_intf);
++		obex_intf_cnt = OBEX_EnumerateInterfaces(env->obexhandle);
+ 		smlTrace(TRACE_INTERNAL, "found %i interfaces", obex_intf_cnt);
+ 		
+ 		if (obex_intf_cnt <= 0) {
+@@ -336,7 +341,8 @@ static void smlTransportObexClientConnec
+ 			smlErrorSet(&error, SML_ERROR_GENERIC, "Unable to find the USB interface number %i", env->port);
+ 			goto error;
+ 		} else {
+-			if (OBEX_InterfaceConnect(env->obexhandle, &obex_intf[env->port]) < 0) {
++			obex_intf = OBEX_GetInterfaceByIndex(env->obexhandle, env->port);
++			if (OBEX_InterfaceConnect(env->obexhandle, obex_intf) < 0) {
+ 				smlErrorSet(&error, SML_ERROR_GENERIC, "Unable to connect to the interface");
+ 				goto error;
+ 			}
diff --git a/comms/libsyncml/patches/patch-ac b/comms/libsyncml/patches/patch-ac
index ad8647cc34a..92d6af51f2b 100644
--- a/comms/libsyncml/patches/patch-ac
+++ b/comms/libsyncml/patches/patch-ac
@@ -1,8 +1,8 @@
-$NetBSD: patch-ac,v 1.1.1.1 2008/01/12 14:09:35 dillo Exp $
+$NetBSD: patch-ac,v 1.2 2013/03/15 08:25:15 plunky Exp $
 
 Regen for patch-aa.
 
---- config.h.in.orig	2008-01-08 00:58:17.000000000 +0100
+--- config.h.in.orig	2007-10-16 13:55:20.000000000 +0000
 +++ config.h.in
 @@ -15,6 +15,9 @@
  /* Defined if the correct libwbxml2 version exists. */
diff --git a/comms/libsyncml/patches/patch-ad b/comms/libsyncml/patches/patch-ad
index 730e01439c2..fbf7588a9bd 100644
--- a/comms/libsyncml/patches/patch-ad
+++ b/comms/libsyncml/patches/patch-ad
@@ -1,8 +1,8 @@
-$NetBSD: patch-ad,v 1.1.1.1 2008/01/12 14:09:35 dillo Exp $
+$NetBSD: patch-ad,v 1.2 2013/03/15 08:25:15 plunky Exp $
 
 Regen for patch-aa (hand trimmed).
 
---- configure.orig	2008-01-08 00:58:11.000000000 +0100
+--- configure.orig	2007-10-16 13:55:17.000000000 +0000
 +++ configure
 @@ -884,6 +884,7 @@ ENABLE_OBEX_TRUE
  ENABLE_OBEX_FALSE
@@ -12,7 +12,7 @@ Regen for patch-aa (hand trimmed).
  ENABLE_BLUETOOTH
  ENABLE_BLUETOOTH_TRUE
  ENABLE_BLUETOOTH_FALSE
-@@ -20785,15 +20770,154 @@ fi
+@@ -20785,15 +20786,154 @@ fi
  
  	{ echo "$as_me:$LINENO: result: no" >&5
  echo "${ECHO_T}no" >&6; }
@@ -169,7 +169,7 @@ Regen for patch-aa (hand trimmed).
  fi
  if test "x${HAVE_BLUETOOTH}" = "xyes"; then
  	if test "x${WANT_BLUETOOTH}" = "xno"; then
-@@ -20811,8 +20934,8 @@ _ACEOF
+@@ -20811,8 +20951,8 @@ _ACEOF
  	fi
  else
  	if test "x${WANT_BLUETOOTH}" = "xyes"; then
@@ -180,7 +180,7 @@ Regen for patch-aa (hand trimmed).
     { (exit 1); exit 1; }; }
  	else
  		ENABLE_BLUETOOTH=no
-@@ -22531,6 +22650,7 @@ ENABLE_OBEX_TRUE!$ENABLE_OBEX_TRUE$ac_de
+@@ -22531,6 +22673,7 @@ ENABLE_OBEX_TRUE!$ENABLE_OBEX_TRUE$ac_de
  ENABLE_OBEX_FALSE!$ENABLE_OBEX_FALSE$ac_delim
  LIBBLUETOOTH_CFLAGS!$LIBBLUETOOTH_CFLAGS$ac_delim
  LIBBLUETOOTH_LIBS!$LIBBLUETOOTH_LIBS$ac_delim
@@ -188,7 +188,7 @@ Regen for patch-aa (hand trimmed).
  ENABLE_BLUETOOTH!$ENABLE_BLUETOOTH$ac_delim
  ENABLE_BLUETOOTH_TRUE!$ENABLE_BLUETOOTH_TRUE$ac_delim
  ENABLE_BLUETOOTH_FALSE!$ENABLE_BLUETOOTH_FALSE$ac_delim
-@@ -22554,7 +22674,7 @@ LIBOBJS!$LIBOBJS$ac_delim
+@@ -22554,7 +22697,7 @@ LIBOBJS!$LIBOBJS$ac_delim
  LTLIBOBJS!$LTLIBOBJS$ac_delim
  _ACEOF
  
diff --git a/comms/libsyncml/patches/patch-tools_syncml-obex-client.c b/comms/libsyncml/patches/patch-tools_syncml-obex-client.c
new file mode 100644
index 00000000000..91700fcb9ba
--- /dev/null
+++ b/comms/libsyncml/patches/patch-tools_syncml-obex-client.c
@@ -0,0 +1,26 @@
+$NetBSD: patch-tools_syncml-obex-client.c,v 1.1 2013/03/15 08:25:15 plunky Exp $
+
+--- tools/syncml-obex-client.c.orig	2012-06-20 20:04:00.000000000 +0000
++++ tools/syncml-obex-client.c
+@@ -361,14 +361,16 @@ void list_interfaces()
+ 	if (geteuid() != 0)
+ 		fprintf(stderr, "Superuser privileges are required to access complete USB information.\n");
+ 
+-	interfaces_number = OBEX_FindInterfaces(handle, &obex_intf);
++	interfaces_number = OBEX_EnumerateInterfaces(handle);
+ 	printf("Found %d USB OBEX interfaces\n", interfaces_number);
+ 	
+-	for (i = 0; i < interfaces_number; i++)
++	for (i = 0; i < interfaces_number; i++) {
++		obex_intf = OBEX_GetInterfaceByIndex(handle, i);
+ 		printf("Interface %d:\n\tManufacturer: %s\n\tProduct: %s\n\tInterface description: %s\n", i,
+-			obex_intf[i].usb.manufacturer,
+-			obex_intf[i].usb.product,
+-			obex_intf[i].usb.control_interface);
++			obex_intf->usb.manufacturer,
++			obex_intf->usb.product,
++			obex_intf->usb.control_interface);
++	}
+ 	
+ 	printf("Use '-u interface_number' to connect\n");
+ 	OBEX_Cleanup(handle);