From 607e28d1612de8b60f95f7730770e84c21a589d7 Mon Sep 17 00:00:00 2001 From: plunky Date: Tue, 12 May 2009 14:36:28 +0000 Subject: set this up to use the older ServiceDiscovery API when appropriate --- comms/bthfp/Makefile | 11 ++++++++--- comms/bthfp/distinfo | 3 ++- comms/bthfp/patches/patch-ab | 21 +++++++++++++++++++++ 3 files changed, 31 insertions(+), 4 deletions(-) create mode 100644 comms/bthfp/patches/patch-ab (limited to 'comms/bthfp') diff --git a/comms/bthfp/Makefile b/comms/bthfp/Makefile index 7e4bb84eab9..3bee30639a3 100644 --- a/comms/bthfp/Makefile +++ b/comms/bthfp/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.5 2009/05/07 18:01:22 plunky Exp $ +# $NetBSD: Makefile,v 1.6 2009/05/12 14:36:28 plunky Exp $ DISTNAME= bthfp-0.1 CATEGORIES= comms @@ -18,8 +18,13 @@ INSTALLATION_DIRS= bin ${PKGMANDIR}/man1 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 do-install: ${INSTALL_PROGRAM} ${WRKSRC}/bthfp ${DESTDIR}${PREFIX}/bin diff --git a/comms/bthfp/distinfo b/comms/bthfp/distinfo index fa36d86133f..dc94630c580 100644 --- a/comms/bthfp/distinfo +++ b/comms/bthfp/distinfo @@ -1,6 +1,7 @@ -$NetBSD: distinfo,v 1.2 2008/06/21 20:47:28 joerg Exp $ +$NetBSD: distinfo,v 1.3 2009/05/12 14:36:28 plunky Exp $ SHA1 (bthfp-0.1.tar.gz) = f0cefa424596545dec3c7d61eb9e608e8178871b RMD160 (bthfp-0.1.tar.gz) = 5185c59ee67a7482ec8c424172fdeebed5bb3238 Size (bthfp-0.1.tar.gz) = 8522 bytes SHA1 (patch-aa) = 66e1d2be8a9de92b7a47bea8bba0adb68510d740 +SHA1 (patch-ab) = 83a4185d99f658ca7a1779c5854dc71855277baf diff --git a/comms/bthfp/patches/patch-ab b/comms/bthfp/patches/patch-ab new file mode 100644 index 00000000000..c1c36929f27 --- /dev/null +++ b/comms/bthfp/patches/patch-ab @@ -0,0 +1,21 @@ +$NetBSD: patch-ab,v 1.1 2009/05/12 14:36:28 plunky Exp $ + +--- Makefile.orig 2009-05-12 13:22:31.000000000 +0100 ++++ Makefile 2009-05-12 13:23:00.000000000 +0100 +@@ -4,7 +4,14 @@ + SRCS= bthfp.c + MAN= bthfp.1 + +-DPADD+= ${LIBBLUETOOTH} ${LIBEVENT} ${LIBSDP} +-LDADD+= -lbluetooth -levent -lsdp ++DPADD+= ${LIBBLUETOOTH} ${LIBEVENT} ++LDADD+= -lbluetooth -levent ++ ++.if (${HAVE_LIBSDP:Uyes} == "no") ++CPPFLAGS+= -DSDP_COMPAT ++.else ++DPADD+= ${LIBSDP} ++LDADD+= -lsdp ++.endif + + .include -- cgit v1.2.3