update obexapp to version 1.4.7, which contains compiler warning fixes

and NetBSD compatibility in the source.

ok by xtraeme@

9 files changed, 39 insertions, 143 deletions

diff --git a/comms/obexapp/DESCR b/comms/obexapp/DESCR
index b4cb03771a4..40078744bbc 100644
--- a/comms/obexapp/DESCR
+++ b/comms/obexapp/DESCR
@@ -1,3 +1,3 @@
 An obex application to transfer objects (address book items, images, movies,
-anything the target can handle) to mobile devices via IrDA, Bluetooth and other
-protocol via the OBEX format.
+anything the target can handle) to mobile devices via Bluetooth with the OBEX
+protocol.
diff --git a/comms/obexapp/Makefile b/comms/obexapp/Makefile
index bfe3c05fae1..7298d4c627f 100644
--- a/comms/obexapp/Makefile
+++ b/comms/obexapp/Makefile
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.7 2007/05/06 08:33:54 xtraeme Exp $
+# $NetBSD: Makefile,v 1.8 2007/05/22 18:53:55 plunky Exp $
 #
 
-DISTNAME=	obexapp-1.4.5
+DISTNAME=	obexapp-1.4.7
 CATEGORIES=	comms
 MASTER_SITES=	http://www.geocities.com/m_evmenkin/
 
@@ -15,23 +15,16 @@ OWN_DIRS+=		${VARBASE}/spool/obex
 
 RCD_SCRIPTS+=		obexapp
 
-SUBST_CLASSES+=		mk var
-SUBST_FILES.mk=		Makefile
-SUBST_STAGE.mk=		post-configure
-SUBST_SED.mk=		-e "s|-lbsdxml|-lexpat|"
-SUBST_SED.mk+=		-e "s|/usr/local/man|${PREFIX}|"
-SUBST_SED.mk+=		-e "s|/usr/local|${PREFIX}|"
-SUBST_SED.mk+=		-e "s|CFLAGS=|CFLAGS+=|"
-SUBST_FILES.var=	obexapp.1 obexapp.h
-SUBST_STAGE.var=	post-configure
-SUBST_SED.var=		-e "s|/var|${VARBASE}|"
+SUBST_CLASSES+=		paths
+SUBST_FILES.paths=	Makefile obexapp.1 obexapp.h
+SUBST_STAGE.paths=	post-configure
+SUBST_SED.paths+=	-e "s|/usr/local/man|${PREFIX}|"
+SUBST_SED.paths+=	-e "s|/usr/local|${PREFIX}|"
+SUBST_SED.paths+=	-e "s|/var|${VARBASE}|"
 
 # Sigh, this needs the GNU libiconv.
 USE_GNU_ICONV=		yes
 
-# Too many warnings with gcc4, disable them for now.
-BUILDLINK_TRANSFORM+=	rm:-Werror
-
 # because the directory name conflicts with the rc.d script
 post-extract:
 	mv ${WRKDIR}/obexapp ${WRKDIR}/${DISTNAME}
diff --git a/comms/obexapp/distinfo b/comms/obexapp/distinfo
index 9365cc3f6b8..6ddde2c4e34 100644
--- a/comms/obexapp/distinfo
+++ b/comms/obexapp/distinfo
@@ -1,10 +1,7 @@
-$NetBSD: distinfo,v 1.5 2007/03/01 21:39:08 plunky Exp $
+$NetBSD: distinfo,v 1.6 2007/05/22 18:53:55 plunky Exp $
 
-SHA1 (obexapp-1.4.5.tar.gz) = 567087731e86906bdaef7f3dd792a18e4686ebdd
-RMD160 (obexapp-1.4.5.tar.gz) = 71f4903ab80692fba33f8242930ec878b24ad1cd
-Size (obexapp-1.4.5.tar.gz) = 30384 bytes
-SHA1 (patch-aa) = 28d245c716a6d8fd57607dd74f239f165da9f4ac
-SHA1 (patch-ab) = a0355450e8af326a24d6db5af436851e67d4d395
-SHA1 (patch-ac) = d9a09e9ca0118ebb489507e2fe9965fbded4552b
-SHA1 (patch-ad) = 8441c157ad3243a25ed3217f3305039b1714de56
-SHA1 (patch-ae) = ee1c382e226e13d278cb91fac205464221b50f87
+SHA1 (obexapp-1.4.7.tar.gz) = 07d20b5ffb1247baf8dfd54356224bb571442ee3
+RMD160 (obexapp-1.4.7.tar.gz) = da44684df4309a3e2d2a204927e3452db5256fa1
+Size (obexapp-1.4.7.tar.gz) = 30846 bytes
+SHA1 (patch-ac) = 7cae80c5a71fdd6cd97785dbf723aecf55e8cb2f
+SHA1 (patch-af) = c3817762db04f25d724444ad2479d9d57efcad52
diff --git a/comms/obexapp/patches/patch-aa b/comms/obexapp/patches/patch-aa
deleted file mode 100644
index 1063f94862c..00000000000
--- a/comms/obexapp/patches/patch-aa
+++ /dev/null
@@ -1,21 +0,0 @@
-$NetBSD: patch-aa,v 1.2 2006/07/09 16:35:31 xtraeme Exp $
-
---- obexapp.h.orig	2004-12-29 22:49:05.000000000 +0100
-+++ obexapp.h	2006-07-09 18:23:44.000000000 +0200
-@@ -32,6 +32,16 @@
- #ifndef _OBEXAPP_H_
- #define _OBEXAPP_H_
- 
-+#ifdef __NetBSD__
-+#define BLUETOOTH_PROTO_RFCOMM	BTPROTO_RFCOMM
-+#define NG_HCI_BDADDR_ANY	BDADDR_ANY
-+#define sockaddr_rfcomm 	sockaddr_bt
-+#define rfcomm_bdaddr		bt_bdaddr
-+#define rfcomm_channel		bt_channel
-+#define rfcomm_len		bt_len
-+#define rfcomm_family		bt_family
-+#endif
-+
- /*
-  * Defines 
-  */
diff --git a/comms/obexapp/patches/patch-ab b/comms/obexapp/patches/patch-ab
deleted file mode 100644
index 27f44ecd85b..00000000000
--- a/comms/obexapp/patches/patch-ab
+++ /dev/null
@@ -1,15 +0,0 @@
-$NetBSD: patch-ab,v 1.2 2006/07/09 16:35:31 xtraeme Exp $
-
---- sdp.c.orig	2003-09-07 21:00:55.000000000 +0200
-+++ sdp.c	2006-07-09 18:27:44.000000000 +0200
-@@ -34,6 +34,10 @@
- #include <sdp.h>
- #include <stdio.h>
- 
-+#ifdef __NetBSD__
-+#define NG_HCI_BDADDR_ANY	BDADDR_ANY
-+#endif
-+
- #undef	PROTOCOL_DESCRIPTOR_LIST_BUFFER_SIZE
- #define	PROTOCOL_DESCRIPTOR_LIST_BUFFER_SIZE	256
- 
diff --git a/comms/obexapp/patches/patch-ac b/comms/obexapp/patches/patch-ac
index e2937a95a38..a2970ff5981 100644
--- a/comms/obexapp/patches/patch-ac
+++ b/comms/obexapp/patches/patch-ac
@@ -1,13 +1,15 @@
-$NetBSD: patch-ac,v 1.2 2006/07/09 16:35:31 xtraeme Exp $
+$NetBSD: patch-ac,v 1.3 2007/05/22 18:53:56 plunky Exp $
 
---- util.c.orig	2006-07-02 20:07:59.000000000 +0200
-+++ util.c	2006-07-02 20:08:07.000000000 +0200
-@@ -30,7 +30,7 @@
+--- util.c.orig	2007-05-21 19:57:51.000000000 +0100
++++ util.c
+@@ -30,9 +30,9 @@
   */
  
  #include <bluetooth.h>
 -#include <bsdxml.h>
-+#include <expat.h>
  #include <ctype.h>
  #include <errno.h>
++#include <expat.h>
  #include <iconv.h>
+ #include <libgen.h>
+ #include <limits.h>
diff --git a/comms/obexapp/patches/patch-ad b/comms/obexapp/patches/patch-ad
deleted file mode 100644
index 96e439b08a8..00000000000
--- a/comms/obexapp/patches/patch-ad
+++ /dev/null
@@ -1,32 +0,0 @@
-$NetBSD: patch-ad,v 1.4 2007/03/01 21:39:09 plunky Exp $
-
---- main.c.orig	2007-01-30 00:35:23.000000000 +0000
-+++ main.c	2007-02-26 10:31:55.000000000 +0000
-@@ -138,6 +138,10 @@
- 			break;
- 
- 		case 'A':
-+#ifdef __NetBSD__
-+			if (!bt_devaddr(optarg, &context.saddr))
-+				err(1, "%s", optarg);
-+#else
- 			if (!bt_aton(optarg, &context.saddr)) {
- 				struct hostent	*he = bt_gethostbyname(optarg);
- 
-@@ -148,6 +152,7 @@
- 				memcpy(&context.saddr, he->h_addr,
- 						sizeof(context.saddr));
- 			}
-+#endif
- 			break;
- 
- 		case 'c': /* client */
-@@ -251,7 +256,7 @@
- 			if (rfcomm_channel_lookup(NULL,
- 						&context.addr.rfcomm_bdaddr,
- 						service, &channel, &n) != 0)
--				errc(1, n, "Could not obtain RFCOMM channel");
-+				errx(1, "Could not obtain RFCOMM channel: %s", strerror(n));
- 
- 			context.addr.rfcomm_channel = (u_int8_t) channel;
- 		}
diff --git a/comms/obexapp/patches/patch-ae b/comms/obexapp/patches/patch-ae
deleted file mode 100644
index 5ba31b7058d..00000000000
--- a/comms/obexapp/patches/patch-ae
+++ /dev/null
@@ -1,44 +0,0 @@
-$NetBSD: patch-ae,v 1.3 2007/03/01 21:39:09 plunky Exp $
-
---- server.c.orig	2007-02-26 10:34:10.000000000 +0000
-+++ server.c	2007-02-26 10:35:11.000000000 +0000
-@@ -149,6 +149,19 @@
- 			strlcpy(context->root, pw->pw_dir, PATH_MAX);
- 	}
- 
-+	log_info("%s: Starting OBEX server", __func__);
-+
-+	if (OBEX_SetTransportMTU(handle, context->mtu, context->mtu) < 0) {
-+		log_err("%s(): OBEX_SetTransportMTU failed", __func__);
-+		goto done;
-+	}
-+
-+	if (OBEX_ServerRegister(handle, (struct sockaddr *) &context->addr,
-+			sizeof(context->addr)) < 0) {
-+		log_err("%s(): OBEX_ServerRegister failed", __func__);
-+		goto done;
-+	}
-+
- 	if (getuid() == 0) {
- 		if (context->secure) {
- 			if (chroot(context->root) < 0) {
-@@ -184,19 +197,6 @@
- 		goto done;
- 	}
- 
--	log_info("%s: Starting OBEX server", __func__);
--
--	if (OBEX_SetTransportMTU(handle, context->mtu, context->mtu) < 0) {
--		log_err("%s(): OBEX_SetTransportMTU failed", __func__);
--		goto done;
--	}
--
--	if (OBEX_ServerRegister(handle, (struct sockaddr *) &context->addr,
--			sizeof(context->addr)) < 0) {
--		log_err("%s(): OBEX_ServerRegister failed", __func__);
--		goto done;
--	}
--
- 	log_debug("%s(): Entering event processing loop...", __func__);
- 
- 	for (error = 0, context->done = 0; !context->done; ) {
diff --git a/comms/obexapp/patches/patch-af b/comms/obexapp/patches/patch-af
new file mode 100644
index 00000000000..9e0985f1d66
--- /dev/null
+++ b/comms/obexapp/patches/patch-af
@@ -0,0 +1,16 @@
+$NetBSD: patch-af,v 1.1 2007/05/22 18:53:56 plunky Exp $
+
+--- Makefile.orig	2007-05-21 19:57:47.000000000 +0100
++++ Makefile
+@@ -17,9 +17,9 @@ CFLAGS+=	-I/usr/local/include \
+ 		-I/usr/local/include/openobex \
+ 		-fno-strict-aliasing
+ 
+-DPADD=		${LIBBLUETOOTH} ${LIBSDP} ${LIBBSDXML} ${LIBREADLINE}
++DPADD=		${LIBBLUETOOTH} ${LIBSDP} ${LIBEXPAT} ${LIBREADLINE}
+ LDADD=		-L/usr/lib -L/usr/local/lib \
+-		-lbluetooth -lsdp -lopenobex -lbsdxml -lreadline -liconv
++		-lbluetooth -lsdp -lopenobex -lexpat -lreadline -liconv
+ 
+ .include <bsd.prog.mk>
+