From 73f46ed5a0db6b98caf1bb761dbbb8cb6396f225 Mon Sep 17 00:00:00 2001
From: plunky <plunky@pkgsrc.org>
Date: Tue, 12 May 2009 14:43:17 +0000
Subject: update this to access the old ServiceDiscovery API where appropriate

---
 comms/obexapp/Makefile         | 11 ++++++++---
 comms/obexapp/distinfo         |  4 ++--
 comms/obexapp/patches/patch-af | 15 +++++++++++----
 3 files changed, 21 insertions(+), 9 deletions(-)

(limited to 'comms')

diff --git a/comms/obexapp/Makefile b/comms/obexapp/Makefile
index 60d3b5f6eb4..eec30bbee3d 100644
--- a/comms/obexapp/Makefile
+++ b/comms/obexapp/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.18 2009/05/07 17:59:37 plunky Exp $
+# $NetBSD: Makefile,v 1.19 2009/05/12 14:43:17 plunky Exp $
 #
 
 DISTNAME=	obexapp-1.4.11
@@ -35,8 +35,13 @@ SUBST_SED.paths+=	-e "s|/var|${VARBASE}|"
 USE_GNU_ICONV=		yes
 USE_BSD_MAKEFILE=	yes
 
-# (work in progress) make sure it uses old SDP API
-CPPFLAGS+=	-DSDP_COMPAT
+.include "../../mk/bsd.prefs.mk"
+
+# This uses the older ServiceDiscovery API
+.if (${OPSYS} == "NetBSD" && \
+    (!empty(OS_VERSION:M5.99.*) || !empty(OS_VERSION:M[6-9].*)))
+MAKE_ENV+=	HAVE_LIBSDP=no
+.endif
 
 # because the directory name conflicts with the rc.d script
 post-extract:
diff --git a/comms/obexapp/distinfo b/comms/obexapp/distinfo
index d130cfa89e6..d53a4956cc9 100644
--- a/comms/obexapp/distinfo
+++ b/comms/obexapp/distinfo
@@ -1,7 +1,7 @@
-$NetBSD: distinfo,v 1.11 2009/05/07 17:45:22 plunky Exp $
+$NetBSD: distinfo,v 1.12 2009/05/12 14:43:17 plunky Exp $
 
 SHA1 (obexapp-1.4.11.tar.gz) = 7f6fd43c226b1d30f90c8b03bd2f3aa88567c3f2
 RMD160 (obexapp-1.4.11.tar.gz) = d93b361873f7b3a31adaaf752a3debb8a2086fd0
 Size (obexapp-1.4.11.tar.gz) = 30981 bytes
 SHA1 (patch-ac) = 7cae80c5a71fdd6cd97785dbf723aecf55e8cb2f
-SHA1 (patch-af) = a2e7b5f139c46085122d4154473e1b9061e9d42c
+SHA1 (patch-af) = cbab3674b8b5fabcddea20c350586986e834c29f
diff --git a/comms/obexapp/patches/patch-af b/comms/obexapp/patches/patch-af
index f17f6a89c45..22af99017f4 100644
--- a/comms/obexapp/patches/patch-af
+++ b/comms/obexapp/patches/patch-af
@@ -1,4 +1,4 @@
-$NetBSD: patch-af,v 1.3 2008/07/09 20:14:37 plunky Exp $
+$NetBSD: patch-af,v 1.4 2009/05/12 14:43:17 plunky Exp $
 
 --- Makefile.orig	2007-04-23 20:29:18.000000000 +0200
 +++ Makefile	2007-05-24 15:43:11.000000000 +0200
@@ -11,15 +11,22 @@ $NetBSD: patch-af,v 1.3 2008/07/09 20:14:37 plunky Exp $
  
  SRCS=		client.c event.c log.c main.c sdp.c server.c stream.c \
  		transport.c util.c
-@@ -17,9 +17,9 @@
+@@ -17,9 +17,16 @@
  		-I/usr/local/include/openobex \
  		-fno-strict-aliasing
  
 -DPADD=		${LIBBLUETOOTH} ${LIBSDP} ${LIBBSDXML} ${LIBREADLINE}
-+DPADD=		${LIBBLUETOOTH} ${LIBSDP} ${LIBREADLINE}
++DPADD=		${LIBBLUETOOTH} ${LIBREADLINE}
  LDADD=		-L/usr/lib -L/usr/local/lib \
 -		-lbluetooth -lsdp -lopenobex -lbsdxml -lreadline -liconv
-+		-lbluetooth -lsdp -lopenobex -lexpat -lreadline -liconv
++		-lbluetooth -lopenobex -lexpat -lreadline -liconv
++
++.if (${HAVE_LIBSDP:Uyes} == "no")
++CPPFLAGS+=	-DSDP_COMPAT
++.else
++DPADD+=	${LIBSDP}
++LDADD+=	-lsdp
++.endif
  
  .include <bsd.prog.mk>
  
-- 
cgit v1.2.3